Skip to content

Commit 62256bd

Browse files
author
Kanchalai Tanglertsampan
committed
Merge branch 'master' into fix4867_transpiling
2 parents 36a82c7 + 8cf347c commit 62256bd

224 files changed

Lines changed: 26098 additions & 19918 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Jakefile.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ var serverCoreSources = [
108108
return path.join(serverDirectory, f);
109109
});
110110

111-
var scriptSources = [
112-
"tslint/booleanTriviaRule.ts",
113-
"tslint/nextLineRule.ts",
114-
"tslint/noNullRule.ts",
115-
"tslint/preferConstRule.ts",
116-
"tslint/typeOperatorSpacingRule.ts",
117-
"tslint/noInOperatorRule.ts"
118-
].map(function (f) {
119-
return path.join(scriptsDirectory, f);
120-
});
121-
122111
var serverSources = serverCoreSources.concat(servicesSources);
123112

124113
var languageServiceLibrarySources = [
@@ -878,7 +867,8 @@ var tslintRules = ([
878867
"preferConstRule",
879868
"booleanTriviaRule",
880869
"typeOperatorSpacingRule",
881-
"noInOperatorRule"
870+
"noInOperatorRule",
871+
"noIncrementDecrementRule"
882872
]);
883873
var tslintRulesFiles = tslintRules.map(function(p) {
884874
return path.join(tslintRuleDir, p + ".ts");
@@ -921,11 +911,20 @@ function lintFileAsync(options, path, cb) {
921911
});
922912
}
923913

914+
var servicesLintTargets = [
915+
"navigateTo.ts",
916+
"outliningElementsCollector.ts",
917+
"patternMatcher.ts",
918+
"services.ts",
919+
"shims.ts",
920+
].map(function (s) {
921+
return path.join(servicesDirectory, s);
922+
});
924923
var lintTargets = compilerSources
925924
.concat(harnessCoreSources)
926925
.concat(serverCoreSources)
927-
.concat(scriptSources)
928-
.concat([path.join(servicesDirectory, "services.ts")]);
926+
.concat(tslintRulesFiles)
927+
.concat(servicesLintTargets);
929928

930929
desc("Runs tslint on the compiler sources");
931930
task("lint", ["build-rules"], function() {
16.5 KB
Binary file not shown.
69.3 KB
Binary file not shown.
5.14 KB
Binary file not shown.
58 KB
Binary file not shown.

doc/images/image1.png

11.4 KB
Loading

doc/images/image2.png

10 KB
Loading

doc/images/image3.png

5.86 KB
Loading

doc/images/image4.png

15.7 KB
Loading

doc/spec.md

Lines changed: 208 additions & 110 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)