Merge branch 'master' into include_ordering

Author: Andy Hanson

.mailmap

@@ -172,4 +172,45 @@ zhongsp <[email protected]> # Patrick Zhong
 T18970237136 <[email protected]> # @T18970237136
 JBerger <[email protected]>
 bootstraponline  <[email protected]> # @bootstraponline
-yortus  <[email protected]> # @yortus
+yortus  <[email protected]> # @yortus
+András Parditka  <[email protected]>
+Anton Khlynovskiy  <[email protected]>
+Charly POLY  <[email protected]>
+Cotton Hou  <[email protected]>
+Ethan Resnick  <[email protected]>
+Marius Schulz  <[email protected]>
+Mattias Buelens  <[email protected]>
+Myles Megyesi  <[email protected]>
+Tim Lancina  <[email protected]>
+Aaron Holmes <[email protected]> Aaron Holmes <[email protected]>
+Akshar Patel <[email protected]>
+Ali Sabzevari <[email protected]>
+Aliaksandr Radzivanovich <[email protected]>
+BuildTools <[email protected]> # Franklin Tse
+ChogyDan <[email protected]> # Daniel Hollocher
+Daniel Rosenwasser <[email protected]> Daniel Rosenwasser <[email protected]>
+David Kmenta <[email protected]>
+E020873 <[email protected]> # Nicolas Henry
+Elisée Maurer <[email protected]>
+Emilio García-Pumarino <[email protected]> dashaus <[email protected]>
+Guilherme Oenning <[email protected]>
+Herrington Darkholme <[email protected]>
+Ivo Gabe de Wolff <[email protected]>
+Joey Wilson <[email protected]>
+Jonathon Smith <[email protected]>
+Juan Luis Boya García <[email protected]>
+Kagami Sascha Rosylight <[email protected]>
+Lucien Greathouse <[email protected]>
+Martin Vseticka <[email protected]>
+Mattias Buelens <[email protected]>
+Michael Bromley <[email protected]>
+Paul Jolly <[email protected]>
+Perry Jiang <[email protected]>
+Peter Burns <[email protected]>
+Robert Coie <[email protected]>
+Thomas Loubiou <[email protected]>
+Tim Perry <[email protected]>
+Vidar Tonaas Fauske <[email protected]>
+Viktor Zozulyak <[email protected]>
+rix <[email protected]> # Richard Sentino
+rohitverma007 <[email protected]> # Rohit Verma

.npmignore

@@ -1,8 +1,11 @@
 built
 doc
+Gulpfile.ts
 internal
 issue_template.md
+jenkins.sh
 lib/README.md
+netci.groovy
 pull_request_template.md
 scripts
 src

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 
 node_js:
   - 'stable'
+  - '6'
   - '4'
 
 sudo: false

AUTHORS.md

@@ -1,17 +1,23 @@
 TypeScript is authored by:
+* Aaron Holmes
 * Abubaker Bashir
 * Adam Freidin
 * Adi Dahiya
 * Ahmad Farid
+* Akshar Patel
 * Alex Eagle
 * Alexander Kuvaev
 * Alexander Rusakov 
+* Ali Sabzevari
+* Aliaksandr Radzivanovich
 * Anatoly Ressin 
 * Anders Hejlsberg
 * Andrej Baran 
 * Andrew Z Allen
+* András Parditka 
 * Andy Hanson
 * Anil Anar
+* Anton Khlynovskiy 
 * Anton Tolmachev
 * Arnav Singh
 * Arthur Ozga
@@ -27,16 +33,20 @@ TypeScript is authored by:
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
+* Charly POLY 
 * Chris Bubernak
 * Christophe Vidal 
 * Chuck Jazdzewski
 * Colby Russell
 * Colin Snover
+* Cotton Hou 
 * Cyrus Najmabadi
 * Dafrok Zhang
 * Dan Corder
 * Dan Quirk
+* Daniel Hollocher
 * Daniel Rosenwasser
+* David Kmenta
 * David Li
 * David Souther
 * Denis Nedelyaev
@@ -45,21 +55,26 @@ TypeScript is authored by:
 * Dirk Holtwick
 * Dom Chen 
 * Doug Ilijev
+* Elisée Maurer
+* Emilio García-Pumarino
 * Eric Tsang
 * Erik Edrosa
+* Ethan Resnick 
 * Ethan Rubio
 * Evan Martin
 * Evan Sebastian
 * Eyas Sharaiha
 * Fabian Cook 
 * @falsandtru
 * Frank Wallis
+* Franklin Tse
 * František Žiacik
 * Gabe Moothart 
 * Gabriel Isenberg
 * Gilad Peleg
 * Godfrey Chan 
 * Graeme Wicksted
+* Guilherme Oenning
 * Guillaume Salles
 * Guy Bedford
 * Harald Niesche
@@ -78,12 +93,14 @@ TypeScript is authored by:
 * Jeffrey Morlan
 * Jesse Schalken
 * Jiri Tobisek
+* Joey Wilson
 * Johannes Rieken
 * John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
 * Jonathan Toland
 * Jonathan Turner
+* Jonathon Smith
 * Josh Abernathy 
 * Josh Kalderimis
 * Josh Soref
@@ -102,15 +119,21 @@ TypeScript is authored by:
 * Lucien Greathouse
 * Lukas Elmer 
 * Marin Marinov
+* Marius Schulz 
 * Martin Vseticka
 * Masahiro Wakame
 * Matt McCutchen
+* Mattias Buelens
+* Mattias Buelens 
 * Max Deepfield
 * Micah Zoltu
 * Michael 
+* Michael Bromley
 * Mohamed Hegazy
+* Myles Megyesi 
 * Nathan Shively-Sanders
 * Nathan Yee
+* Nicolas Henry
 * Nima Zahedi
 * Noah Chen 
 * Noj Vek
@@ -119,9 +142,12 @@ TypeScript is authored by:
 * Omer Sheikh 
 * Oskar Segersva¨rd
 * Patrick Zhong
+* Paul Jolly
 * Paul van Brenk
 * @pcbro
 * Pedro Maltez
+* Perry Jiang
+* Peter Burns
 * Philip Bulley
 * Piero Cangianiello
 * @piloopin
@@ -130,6 +156,9 @@ TypeScript is authored by:
 * Punya Biswal
 * Rado Kirov
 * Richard Knoll
+* Richard Sentino
+* Robert Coie
+* Rohit Verma
 * Ron Buckton
 * Rostislav Galimsky 
 * Rowan Wyborn
@@ -152,7 +181,9 @@ TypeScript is authored by:
 * @T18970237136
 * Tarik Ozket
 * Tetsuharu Ohzeki
+* Thomas Loubiou
 * Tien Hoanhtien
+* Tim Lancina 
 * Tim Perry
 * Tim Viiding-Spader
 * Tingan Ho
@@ -161,6 +192,8 @@ TypeScript is authored by:
 * Tomas Grubliauskas
 * Torben Fitschen 
 * TruongSinh Tran-Nguyen
+* Vidar Tonaas Fauske
+* Viktor Zozulyak
 * Vilic Vane
 * Vladimir Matveev
 * Wesley Wigham

Gulpfile.ts

@@ -471,7 +471,10 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
         js.pipe(prependCopyright())
             .pipe(sourcemaps.write("."))
             .pipe(gulp.dest(".")),
-        dts.pipe(prependCopyright())
+        dts.pipe(prependCopyright(/*outputCopyright*/true))
+            .pipe(insert.transform((content) => {
+                return content + "\r\nexport = ts;\r\nexport as namespace ts;";
+            }))
             .pipe(gulp.dest("."))
     ]);
 });

Jakefile.js

@@ -151,6 +151,7 @@ var servicesSources = [
     "signatureHelp.ts",
     "symbolDisplay.ts",
     "transpile.ts",
+    // Formatting
     "formatting/formatting.ts",
     "formatting/formattingContext.ts",
     "formatting/formattingRequestKind.ts",
@@ -166,36 +167,53 @@ var servicesSources = [
     "formatting/rulesMap.ts",
     "formatting/rulesProvider.ts",
     "formatting/smartIndenter.ts",
-    "formatting/tokenRange.ts"
+    "formatting/tokenRange.ts",
+    // CodeFixes
+    "codeFixProvider.ts",
+    "codefixes/fixes.ts",
+    "codefixes/fixExtendsInterfaceBecomesImplements.ts",
+    "codefixes/fixClassIncorrectlyImplementsInterface.ts",
+    "codefixes/fixClassDoesntImplementInheritedAbstractMember.ts",
+    "codefixes/fixClassSuperMustPrecedeThisAccess.ts",
+    "codefixes/fixConstructorForDerivedNeedSuperCall.ts",
+    "codefixes/helpers.ts",
+    "codefixes/importFixes.ts",
+    "codefixes/unusedIdentifierFixes.ts"
 ].map(function (f) {
     return path.join(servicesDirectory, f);
 }));
 
-var serverCoreSources = [
-    "types.d.ts",
-    "shared.ts",
-    "utilities.ts",
-    "scriptVersionCache.ts",
-    "typingsCache.ts",
-    "scriptInfo.ts",
+var baseServerCoreSources = [
+	"builder.ts",
+    "editorServices.ts",
     "lsHost.ts",
     "project.ts",
-    "editorServices.ts",
     "protocol.ts",
+    "scriptInfo.ts",
+    "scriptVersionCache.ts",
     "session.ts",
-    "server.ts"
+    "shared.ts",
+    "types.ts",
+    "typingsCache.ts",
+    "utilities.ts",
 ].map(function (f) {
     return path.join(serverDirectory, f);
 });
 
+var serverCoreSources = [
+    "server.ts"
+].map(function (f) {
+    return path.join(serverDirectory, f);
+}).concat(baseServerCoreSources);
+
 var cancellationTokenSources = [
     "cancellationToken.ts"
 ].map(function (f) {
     return path.join(cancellationTokenDirectory, f);
 });
 
 var typingsInstallerSources = [
-    "../types.d.ts",
+    "../types.ts",
     "../shared.ts",
     "typingsInstaller.ts",
     "nodeTypingsInstaller.ts"
@@ -204,20 +222,7 @@ var typingsInstallerSources = [
 });
 
 var serverSources = serverCoreSources.concat(servicesSources);
-
-var languageServiceLibrarySources = [
-    "protocol.ts",
-    "utilities.ts",
-    "scriptVersionCache.ts",
-    "scriptInfo.ts",
-    "lsHost.ts",
-    "project.ts",
-    "editorServices.ts",
-    "session.ts",
-
-].map(function (f) {
-    return path.join(serverDirectory, f);
-}).concat(servicesSources);
+var languageServiceLibrarySources = baseServerCoreSources.concat(servicesSources);
 
 var harnessCoreSources = [
     "harness.ts",
@@ -250,6 +255,7 @@ var harnessSources = harnessCoreSources.concat([
     "convertToBase64.ts",
     "transpile.ts",
     "reuseProgramStructure.ts",
+    "textStorage.ts",
     "cachingInServerLSHost.ts",
     "moduleResolution.ts",
     "tsconfigParsing.ts",
@@ -352,19 +358,16 @@ function prependFile(prefixFile, destinationFile) {
 // concatenate a list of sourceFiles to a destinationFile
 function concatenateFiles(destinationFile, sourceFiles) {
     var temp = "temptemp";
-    // Copy the first file to temp
-    if (!fs.existsSync(sourceFiles[0])) {
-        fail(sourceFiles[0] + " does not exist!");
-    }
-    jake.cpR(sourceFiles[0], temp, { silent: true });
     // append all files in sequence
-    for (var i = 1; i < sourceFiles.length; i++) {
+    var text = "";
+    for (var i = 0; i < sourceFiles.length; i++) {
         if (!fs.existsSync(sourceFiles[i])) {
             fail(sourceFiles[i] + " does not exist!");
         }
-        fs.appendFileSync(temp, "\n\n");
-        fs.appendFileSync(temp, fs.readFileSync(sourceFiles[i]));
+        if (i > 0) { text += "\n\n"; }
+        text += fs.readFileSync(sourceFiles[i]).toString().replace(/\r?\n/g, "\n");
     }
+    fs.writeFileSync(temp, text);
     // Move the file to the final destination
     fs.renameSync(temp, destinationFile);
 }
@@ -717,7 +720,18 @@ compileFile(
     [builtLocalDirectory, copyright, builtLocalCompiler].concat(languageServiceLibrarySources).concat(libraryTargets),
     /*prefixes*/[copyright],
     /*useBuiltCompiler*/ true,
-    { noOutFile: false, generateDeclarations: true });
+    { noOutFile: false, generateDeclarations: true, stripInternal: true },
+    /*callback*/ function () {
+        prependFile(copyright, tsserverLibraryDefinitionFile);
+
+        // Appending exports at the end of the server library
+        var tsserverLibraryDefinitionFileContents =
+            fs.readFileSync(tsserverLibraryDefinitionFile).toString() + 
+            "\r\nexport = ts;" +
+            "\r\nexport as namespace ts;";
+
+        fs.writeFileSync(tsserverLibraryDefinitionFile, tsserverLibraryDefinitionFileContents);
+    });
 
 // Local target to build the language service server library
 desc("Builds language service server library");
@@ -1181,7 +1195,6 @@ task("update-sublime", ["local", serverFile], function () {
 var tslintRuleDir = "scripts/tslint";
 var tslintRules = [
     "nextLineRule",
-    "preferConstRule",
     "booleanTriviaRule",
     "typeOperatorSpacingRule",
     "noInOperatorRule",

lib/.gitattributes

@@ -0,0 +1 @@
+* text eol=lf