Merge branch 'master' into APIReviewCleanup

Conflicts:	src/services/outliningElementsCollector.ts

Author: mhegazy

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Your pull request should:
  * Tests should include reasonable permutations of the target fix/change
  * Include baseline changes with your change
  * All changed code must have 100% code coverage
-* Follow the code conventions descriped in [Coding guidlines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidlines)
+* Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
 * To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
 
 ## Running the Tests

src/compiler/binder.ts

@@ -540,7 +540,7 @@ module ts {
  bindChildren(node, 0, /*isBlockScopeContainer*/ false);
  break;
  case SyntaxKind.ExportAssignment:
- if ((<ExportAssignment>node).expression && (<ExportAssignment>node).expression.kind === SyntaxKind.Identifier) {
+ if ((<ExportAssignment>node).expression.kind === SyntaxKind.Identifier) {
  // An export default clause with an identifier exports all meanings of that identifier
  declareSymbol(container.symbol.exports, container.symbol, <Declaration>node, SymbolFlags.Alias, SymbolFlags.PropertyExcludes | SymbolFlags.AliasExcludes);
  }

src/compiler/checker.ts

@@ -434,7 +434,7 @@ module ts {
  return path.replace(/\\/g, "/");
  }
 
- // Returns length of path root (i.e. length of "/", "x:/", "//server/share/")
+ // Returns length of path root (i.e. length of "/", "x:/", "//server/share/, file:///user/files")
  export function getRootLength(path: string): number {
  if (path.charCodeAt(0) === CharacterCodes.slash) {
  if (path.charCodeAt(1) !== CharacterCodes.slash) return 1;
@@ -448,6 +448,8 @@ module ts {
  if (path.charCodeAt(2) === CharacterCodes.slash) return 3;
  return 2;
  }
+ let idx = path.indexOf('://');
+ if (idx !== -1) return idx + 3
  return 0;
  }
 

src/compiler/core.ts

@@ -442,20 +442,41 @@ module ts {
  emitLines(node.statements);
  }
 
+ // Return a temp variable name to be used in `export default` statements.
+ // The temp name will be of the form _default_counter.
+ // Note that export default is only allowed at most once in a module, so we
+ // do not need to keep track of created temp names.
+ function getExportDefaultTempVariableName(): string {
+ let baseName = "_default";
+ if (!hasProperty(currentSourceFile.identifiers, baseName)) {
+ return baseName;
+ }
+ let count = 0;
+ while (true) {
+ let name = baseName + "_" + (++count);
+ if (!hasProperty(currentSourceFile.identifiers, name)) {
+ return name;
+ }
+ }
+ }
+
  function emitExportAssignment(node: ExportAssignment) {
- write(node.isExportEquals ? "export = " : "export default ");
  if (node.expression.kind === SyntaxKind.Identifier) {
+ write(node.isExportEquals ? "export = " : "export default ");
  writeTextOfNode(currentSourceFile, node.expression);
  }
  else {
+ // Expression
+ let tempVarName = getExportDefaultTempVariableName();
+ write("declare var ");
+ write(tempVarName);
  write(": ");
- if (node.type) {
- emitType(node.type);
- }
- else {
- writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
- resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer);
- }
+ writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
+ resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer);
+ write(";");
+ writeLine();
+ write(node.isExportEquals ? "export = " : "export default ");
+ write(tempVarName);
  }
  write(";");
  writeLine();

src/compiler/declarationEmitter.ts

@@ -159,7 +159,6 @@ module ts {
  An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
  Unterminated_Unicode_escape_sequence: { code: 1199, category: DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
  Line_terminator_not_permitted_before_arrow: { code: 1200, category: DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
- A_type_annotation_on_an_export_statement_is_only_allowed_in_an_ambient_external_module_declaration: { code: 1201, category: DiagnosticCategory.Error, key: "A type annotation on an export statement is only allowed in an ambient external module declaration." },
  Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead: { code: 1202, category: DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"' or 'import d from \"mod\"' instead." },
  Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead: { code: 1203, category: DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead." },
  Cannot_compile_external_modules_into_amd_or_commonjs_when_targeting_es6_or_higher: { code: 1204, category: DiagnosticCategory.Error, key: "Cannot compile external modules into amd or commonjs when targeting es6 or higher." },
@@ -345,8 +344,8 @@ module ts {
  The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
  The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
  Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: DiagnosticCategory.Error, key: "Invalid left-hand side in 'for...of' statement." },
- The_right_hand_side_of_a_for_of_statement_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: DiagnosticCategory.Error, key: "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator." },
- The_iterator_returned_by_the_right_hand_side_of_a_for_of_statement_must_have_a_next_method: { code: 2489, category: DiagnosticCategory.Error, key: "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method." },
+ Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: DiagnosticCategory.Error, key: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
+ An_iterator_must_have_a_next_method: { code: 2489, category: DiagnosticCategory.Error, key: "An iterator must have a 'next()' method." },
  The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: DiagnosticCategory.Error, key: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
  The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: DiagnosticCategory.Error, key: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
  Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: DiagnosticCategory.Error, key: "Cannot redeclare identifier '{0}' in catch clause" },

src/compiler/diagnosticInformationMap.generated.ts

@@ -623,10 +623,6 @@
  "category": "Error",
  "code": 1200
  },
- "A type annotation on an export statement is only allowed in an ambient external module declaration.": {
- "category": "Error",
- "code": 1201
- },
  "Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"' or 'import d from \"mod\"' instead.": {
  "category": "Error",
  "code": 1202
@@ -1367,11 +1363,11 @@
  "category": "Error",
  "code": 2487
  },
- "The right-hand side of a 'for...of' statement must have a '[Symbol.iterator]()' method that returns an iterator.": {
+ "Type must have a '[Symbol.iterator]()' method that returns an iterator.": {
  "category": "Error",
  "code": 2488
  },
- "The iterator returned by the right-hand side of a 'for...of' statement must have a 'next()' method.": {
+ "An iterator must have a 'next()' method.": {
  "category": "Error",
  "code": 2489
  },