Skip to content

Commit 001b7b5

Browse files
committed
Merge pull request #2 from Microsoft/master
fetch latest code
2 parents bf8812e + 33bfd92 commit 001b7b5

File tree

4,598 files changed

+158729
-33927
lines changed

Some content is hidden

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

4,598 files changed

+158729
-33927
lines changed

Jakefile.js

Lines changed: 15 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 = [
@@ -544,7 +533,8 @@ compileFile(word2mdJs,
544533
// The generated spec.md; built for the 'generate-spec' task
545534
file(specMd, [word2mdJs, specWord], function () {
546535
var specWordFullPath = path.resolve(specWord);
547-
var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + specMd;
536+
var specMDFullPath = path.resolve(specMd);
537+
var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + '"' + specMDFullPath + '"';
548538
console.log(cmd);
549539
child_process.exec(cmd, function () {
550540
complete();
@@ -877,7 +867,8 @@ var tslintRules = ([
877867
"preferConstRule",
878868
"booleanTriviaRule",
879869
"typeOperatorSpacingRule",
880-
"noInOperatorRule"
870+
"noInOperatorRule",
871+
"noIncrementDecrementRule"
881872
]);
882873
var tslintRulesFiles = tslintRules.map(function(p) {
883874
return path.join(tslintRuleDir, p + ".ts");
@@ -920,10 +911,20 @@ function lintFileAsync(options, path, cb) {
920911
});
921912
}
922913

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+
});
923923
var lintTargets = compilerSources
924924
.concat(harnessCoreSources)
925925
.concat(serverCoreSources)
926-
.concat(scriptSources);
926+
.concat(tslintRulesFiles)
927+
.concat(servicesLintTargets);
927928

928929
desc("Runs tslint on the compiler sources");
929930
task("lint", ["build-rules"], function() {

doc/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This directory contains miscellaneous documentation such as the TypeScript language specification and logo.
2+
If you are looking for more introductory material, you might want to take a look at the [TypeScript Handbook](https://github.com/Microsoft/TypeScript-Handbook).
3+
4+
# Spec Contributions
5+
6+
The specification is first authored as a Microsoft Word (docx) file and then generated into Markdown and PDF formats.
7+
Due to the binary format of docx files, and the merging difficulties that may come with it, it is preferred that any suggestions or problems found in the spec should be [filed as issues](https://github.com/Microsoft/TypeScript/issues/new) rather than sent as pull requests.
Binary file not shown.
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

0 commit comments

Comments
 (0)