Merge branch 'master' into fixParsingShorthand

Author: Yui T

bin/lib.core.d.ts

@@ -499,6 +499,10 @@ declare var Number: {
  POSITIVE_INFINITY: number;
 }
 
+interface TemplateStringsArray extends Array<string> {
+ raw: string[];
+}
+
 interface Math {
  /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
  E: number;

bin/lib.d.ts

@@ -499,6 +499,10 @@ declare var Number: {
  POSITIVE_INFINITY: number;
 }
 
+interface TemplateStringsArray extends Array<string> {
+ raw: string[];
+}
+
 interface Math {
  /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
  E: number;

bin/tsc.js

@@ -75,43 +75,43 @@ module ts {
 
  var checker: TypeChecker = {
  getProgram: () => program,
- getDiagnostics: getDiagnostics,
- getGlobalDiagnostics: getGlobalDiagnostics,
  getNodeCount: () => sum(program.getSourceFiles(), "nodeCount"),
  getIdentifierCount: () => sum(program.getSourceFiles(), "identifierCount"),
  getSymbolCount: () => sum(program.getSourceFiles(), "symbolCount"),
  getTypeCount: () => typeCount,
- checkProgram: checkProgram,
- emitFiles: invokeEmitter,
- getParentOfSymbol: getParentOfSymbol,
- getNarrowedTypeOfSymbol: getNarrowedTypeOfSymbol,
- getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
- getPropertiesOfType: getPropertiesOfType,
- getPropertyOfType: getPropertyOfType,
- getSignaturesOfType: getSignaturesOfType,
- getIndexTypeOfType: getIndexTypeOfType,
- getReturnTypeOfSignature: getReturnTypeOfSignature,
- getSymbolsInScope: getSymbolsInScope,
- getSymbolInfo: getSymbolInfo,
- getShorthandAssignmentValueSymbol: getShorthandAssignmentValueSymbol,
- getTypeOfNode: getTypeOfNode,
- typeToString: typeToString,
- getSymbolDisplayBuilder: getSymbolDisplayBuilder,
- symbolToString: symbolToString,
- getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
- getRootSymbols: getRootSymbols,
- getContextualType: getContextualType,
- getFullyQualifiedName: getFullyQualifiedName,
- getResolvedSignature: getResolvedSignature,
- getEnumMemberValue: getEnumMemberValue,
- isValidPropertyAccess: isValidPropertyAccess,
- getSignatureFromDeclaration: getSignatureFromDeclaration,
- isImplementationOfOverload: isImplementationOfOverload,
- getAliasedSymbol: resolveImport,
  isUndefinedSymbol: symbol => symbol === undefinedSymbol,
  isArgumentsSymbol: symbol => symbol === argumentsSymbol,
- hasEarlyErrors: hasEarlyErrors,
- isEmitBlocked: isEmitBlocked
+ getDiagnostics,
+ getGlobalDiagnostics,
+ checkProgram,
+ invokeEmitter,
+ getParentOfSymbol,
+ getNarrowedTypeOfSymbol,
+ getDeclaredTypeOfSymbol,
+ getPropertiesOfType,
+ getPropertyOfType,
+ getSignaturesOfType,
+ getIndexTypeOfType,
+ getReturnTypeOfSignature,
+ getSymbolsInScope,
+ getSymbolInfo,
+ getShorthandAssignmentValueSymbol,
+ getTypeOfNode,
+ typeToString,
+ getSymbolDisplayBuilder,
+ symbolToString,
+ getAugmentedPropertiesOfType,
+ getRootSymbols,
+ getContextualType,
+ getFullyQualifiedName,
+ getResolvedSignature,
+ getEnumMemberValue,
+ isValidPropertyAccess,
+ getSignatureFromDeclaration,
+ isImplementationOfOverload,
+ getAliasedSymbol: resolveImport,
+ hasEarlyErrors,
+ isEmitBlocked,
  };
 
  var undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined");
@@ -953,7 +953,7 @@ module ts {
  if (forEach(symbol.declarations, declaration => !getIsDeclarationVisible(declaration))) {
  return undefined;
  }
- return { aliasesToMakeVisible: aliasesToMakeVisible };
+ return { aliasesToMakeVisible };
 
  function getIsDeclarationVisible(declaration: Declaration) {
  if (!isDeclarationVisible(declaration)) {
@@ -9118,22 +9118,22 @@ module ts {
  function invokeEmitter(targetSourceFile?: SourceFile) {
  var resolver: EmitResolver = {
  getProgram: () => program,
- getLocalNameOfContainer: getLocalNameOfContainer,
- getExpressionNamePrefix: getExpressionNamePrefix,
- getExportAssignmentName: getExportAssignmentName,
- isReferencedImportDeclaration: isReferencedImportDeclaration,
- getNodeCheckFlags: getNodeCheckFlags,
- getEnumMemberValue: getEnumMemberValue,
- isTopLevelValueImportWithEntityName: isTopLevelValueImportWithEntityName,
- hasSemanticErrors: hasSemanticErrors,
- isEmitBlocked: isEmitBlocked,
- isDeclarationVisible: isDeclarationVisible,
- isImplementationOfOverload: isImplementationOfOverload,
- writeTypeAtLocation: writeTypeAtLocation,
- writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
- isSymbolAccessible: isSymbolAccessible,
- isImportDeclarationEntityNameReferenceDeclarationVisibile: isImportDeclarationEntityNameReferenceDeclarationVisibile,
- getConstantValue: getConstantValue,
+ getLocalNameOfContainer,
+ getExpressionNamePrefix,
+ getExportAssignmentName,
+ isReferencedImportDeclaration,
+ getNodeCheckFlags,
+ getEnumMemberValue,
+ isTopLevelValueImportWithEntityName,
+ hasSemanticErrors,
+ isEmitBlocked,
+ isDeclarationVisible,
+ isImplementationOfOverload,
+ writeTypeAtLocation,
+ writeReturnTypeOfSignatureDeclaration,
+ isSymbolAccessible,
+ isImportDeclarationEntityNameReferenceDeclarationVisibile,
+ getConstantValue,
  };
  checkProgram();
  return emitFiles(resolver, targetSourceFile);

bin/typescriptServices.js

@@ -153,9 +153,9 @@ module ts {
 
  parseStrings(commandLine);
  return {
- options: options,
- filenames: filenames,
- errors: errors
+ options,
+ filenames,
+ errors
  };
 
  function parseStrings(args: string[]) {

src/compiler/checker.ts

@@ -258,9 +258,9 @@ module ts {
  }
 
  return {
- file: file,
- start: start,
- length: length,
+ file,
+ start,
+ length,
 
  messageText: text,
  category: message.category,
@@ -335,12 +335,12 @@ module ts {
  }
 
  return {
- file: file,
- start: start,
- length: length,
- code: code,
- category: category,
- messageText: messageText
+ file,
+ start,
+ length,
+ code,
+ category,
+ messageText
  };
  }
 

src/compiler/commandLineParser.ts

@@ -273,6 +273,7 @@ module ts {
  Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: DiagnosticCategory.Error, key: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
  Type_alias_0_circularly_references_itself: { code: 2456, category: DiagnosticCategory.Error, key: "Type alias '{0}' circularly references itself." },
  Type_alias_name_cannot_be_0: { code: 2457, category: DiagnosticCategory.Error, key: "Type alias name cannot be '{0}'" },
+ An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: DiagnosticCategory.Error, key: "An AMD module cannot have multiple name assignments." },
  Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
  Type_parameter_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4001, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
  Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },

src/compiler/core.ts

@@ -1089,6 +1089,10 @@
  "category": "Error",
  "code": 2457
  },
+ "An AMD module cannot have multiple name assignments.": {
+ "category": "Error",
+ "code": 2458
+ },
 
  "Import declaration '{0}' is using private name '{1}'.": {
  "category": "Error",

src/compiler/diagnosticInformationMap.generated.ts

@@ -104,9 +104,9 @@ module ts {
  }
  });
  return {
- firstAccessor: firstAccessor,
- getAccessor: getAccessor,
- setAccessor: setAccessor
+ firstAccessor,
+ getAccessor,
+ setAccessor
  };
  }
 
@@ -2134,7 +2134,11 @@ module ts {
  function emitAMDModule(node: SourceFile, startIndex: number) {
  var imports = getExternalImportDeclarations(node);
  writeLine();
- write("define([\"require\", \"exports\"");
+ write("define(");
+ if(node.amdModuleName) {
+ write("\"" + node.amdModuleName + "\", ");
+ }
+ write("[\"require\", \"exports\"");
  forEach(imports, imp => {
  write(", ");
  emitLiteral(imp.externalModuleName);
@@ -2783,7 +2787,7 @@ module ts {
  Diagnostics.Exported_type_alias_0_has_or_is_using_name_1_from_private_module_2 :
  Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1;
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: node,
  typeName: node.name
  };
@@ -2880,7 +2884,7 @@ module ts {
  }
 
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: node,
  typeName: node.name
  };
@@ -2945,7 +2949,7 @@ module ts {
  }
 
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: node,
  typeName: (<Declaration>node.parent).name
  };
@@ -3127,7 +3131,7 @@ module ts {
  Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
  }
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: <Node>node.parameters[0],
  // TODO(jfreeman): Investigate why we are passing node.name instead of node.parameters[0].name
  typeName: node.name
@@ -3149,7 +3153,7 @@ module ts {
  Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
  }
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: <Node>node.name,
  typeName: undefined
  };
@@ -3279,7 +3283,7 @@ module ts {
  }
 
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: <Node>node.name || node,
  };
  }
@@ -3364,7 +3368,7 @@ module ts {
  }
 
  return {
- diagnosticMessage: diagnosticMessage,
+ diagnosticMessage,
  errorNode: node,
  typeName: node.name
  };
@@ -3549,22 +3553,22 @@ module ts {
  var hasEmitterError = forEach(diagnostics, diagnostic => diagnostic.category === DiagnosticCategory.Error);
 
  // Check and update returnCode for syntactic and semantic
- var returnCode: EmitReturnStatus;
+ var emitResultStatus: EmitReturnStatus;
  if (isEmitBlocked) {
- returnCode = EmitReturnStatus.AllOutputGenerationSkipped;
+ emitResultStatus = EmitReturnStatus.AllOutputGenerationSkipped;
  } else if (hasEmitterError) {
- returnCode = EmitReturnStatus.EmitErrorsEncountered;
+ emitResultStatus = EmitReturnStatus.EmitErrorsEncountered;
  } else if (hasSemanticErrors && compilerOptions.declaration) {
- returnCode = EmitReturnStatus.DeclarationGenerationSkipped;
+ emitResultStatus = EmitReturnStatus.DeclarationGenerationSkipped;
  } else if (hasSemanticErrors && !compilerOptions.declaration) {
- returnCode = EmitReturnStatus.JSGeneratedWithSemanticErrors;
+ emitResultStatus = EmitReturnStatus.JSGeneratedWithSemanticErrors;
  } else {
- returnCode = EmitReturnStatus.Succeeded;
+ emitResultStatus = EmitReturnStatus.Succeeded;
  }
 
  return {
- emitResultStatus: returnCode,
- errors: diagnostics,
+ emitResultStatus,
+ diagnostics,
  sourceMaps: sourceMapDataList
  };
  }