Skip to content

Commit e7668b0

Browse files
mhegazymhegazy
authored
Merge pull request #13075 from Microsoft/mergeMaster1220
Merge master 12/20
2 parents e405736 + e252ae0 commit e7668b0

File tree

68 files changed

+2124
-333
lines changed

Some content is hidden

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

68 files changed

+2124
-333
lines changed

‎.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
built
22
doc
3+
Gulpfile.ts
34
internal
45
issue_template.md
6+
jenkins.sh
57
lib/README.md
8+
netci.groovy
69
pull_request_template.md
710
scripts
811
src

‎lib/protocol.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,12 +1734,14 @@ declare namespace ts.server.protocol {
17341734
insertSpaceAfterCommaDelimiter?: boolean;
17351735
insertSpaceAfterSemicolonInForStatements?: boolean;
17361736
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
1737+
insertSpaceAfterConstructor?: boolean;
17371738
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
17381739
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
17391740
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
17401741
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
17411742
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
17421743
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
1744+
insertSpaceBeforeFunctionParenthesis?: boolean;
17431745
placeOpenBraceOnNewLineForFunctions?: boolean;
17441746
placeOpenBraceOnNewLineForControlBlocks?: boolean;
17451747
}

‎lib/tsc.js

Lines changed: 134 additions & 42 deletions
Large diffs are not rendered by default.

‎lib/tsserver.js

Lines changed: 152 additions & 45 deletions
Large diffs are not rendered by default.

‎lib/tsserverlibrary.d.ts

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,14 @@ declare namespace ts.server.protocol {
767767
insertSpaceAfterCommaDelimiter?: boolean;
768768
insertSpaceAfterSemicolonInForStatements?: boolean;
769769
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
770+
insertSpaceAfterConstructor?: boolean;
770771
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
771772
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
772773
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
773774
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
774775
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
775776
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
777+
insertSpaceBeforeFunctionParenthesis?: boolean;
776778
placeOpenBraceOnNewLineForFunctions?: boolean;
777779
placeOpenBraceOnNewLineForControlBlocks?: boolean;
778780
}
@@ -4181,7 +4183,7 @@ declare namespace ts {
41814183
key: string;
41824184
message: string;
41834185
};
4184-
Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: {
4186+
Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0o_0: {
41854187
code: number;
41864188
category: DiagnosticCategory;
41874189
key: string;
@@ -7865,6 +7867,12 @@ declare namespace ts {
78657867
key: string;
78667868
message: string;
78677869
};
7870+
File_0_has_an_unsupported_extension_so_skipping_it: {
7871+
code: number;
7872+
category: DiagnosticCategory;
7873+
key: string;
7874+
message: string;
7875+
};
78687876
Only_amd_and_system_modules_are_supported_alongside_0: {
78697877
code: number;
78707878
category: DiagnosticCategory;
@@ -8255,6 +8263,12 @@ declare namespace ts {
82558263
key: string;
82568264
message: string;
82578265
};
8266+
Resolution_for_module_0_was_found_in_cache: {
8267+
code: number;
8268+
category: DiagnosticCategory;
8269+
key: string;
8270+
message: string;
8271+
};
82588272
Variable_0_implicitly_has_an_1_type: {
82598273
code: number;
82608274
category: DiagnosticCategory;
@@ -8687,6 +8701,12 @@ declare namespace ts {
86878701
key: string;
86888702
message: string;
86898703
};
8704+
Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0o_0: {
8705+
code: number;
8706+
category: DiagnosticCategory;
8707+
key: string;
8708+
message: string;
8709+
};
86908710
};
86918711
}
86928712
declare namespace ts {
@@ -8907,7 +8927,13 @@ declare namespace ts {
89078927
}): string[] | undefined;
89088928
function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
89098929
function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
8910-
function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
8930+
interface ModuleResolutionCache {
8931+
getOrCreateCacheForDirectory(directoryName: string): Map<ResolvedModuleWithFailedLookupLocations>;
8932+
}
8933+
function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): {
8934+
getOrCreateCacheForDirectory: (directoryName: string) => Map<ResolvedModuleWithFailedLookupLocations>;
8935+
};
8936+
function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations;
89118937
function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
89128938
function directoryProbablyExists(directoryName: string, host: {
89138939
directoryExists?: (directoryName: string) => boolean;
@@ -8991,6 +9017,7 @@ declare namespace ts {
89919017
let fullTripleSlashReferenceTypeReferenceDirectiveRegEx: RegExp;
89929018
let fullTripleSlashAMDReferencePathRegEx: RegExp;
89939019
function isPartOfTypeNode(node: Node): boolean;
9020+
function isChildOfLiteralType(node: Node): boolean;
89949021
function forEachReturnStatement<T>(body: Block, visitor: (stmt: ReturnStatement) => T): T;
89959022
function forEachYieldExpression(body: Block, visitor: (expr: YieldExpression) => void): void;
89969023
function getRestParameterElementType(node: TypeNode): TypeNode;
@@ -10049,6 +10076,7 @@ declare namespace ts {
1004910076
InsertSpaceAfterCommaDelimiter: boolean;
1005010077
InsertSpaceAfterSemicolonInForStatements: boolean;
1005110078
InsertSpaceBeforeAndAfterBinaryOperators: boolean;
10079+
InsertSpaceAfterConstructor?: boolean;
1005210080
InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
1005310081
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
1005410082
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
@@ -10057,13 +10085,15 @@ declare namespace ts {
1005710085
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
1005810086
InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
1005910087
InsertSpaceAfterTypeAssertion?: boolean;
10088+
InsertSpaceBeforeFunctionParenthesis?: boolean;
1006010089
PlaceOpenBraceOnNewLineForFunctions: boolean;
1006110090
PlaceOpenBraceOnNewLineForControlBlocks: boolean;
1006210091
}
1006310092
interface FormatCodeSettings extends EditorSettings {
1006410093
insertSpaceAfterCommaDelimiter?: boolean;
1006510094
insertSpaceAfterSemicolonInForStatements?: boolean;
1006610095
insertSpaceBeforeAndAfterBinaryOperators?: boolean;
10096+
insertSpaceAfterConstructor?: boolean;
1006710097
insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
1006810098
insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
1006910099
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
@@ -10072,6 +10102,7 @@ declare namespace ts {
1007210102
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
1007310103
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
1007410104
insertSpaceAfterTypeAssertion?: boolean;
10105+
insertSpaceBeforeFunctionParenthesis?: boolean;
1007510106
placeOpenBraceOnNewLineForFunctions?: boolean;
1007610107
placeOpenBraceOnNewLineForControlBlocks?: boolean;
1007710108
}
@@ -10710,6 +10741,7 @@ declare namespace ts.formatting {
1071010741
SpaceAfterLetConstInVariableDeclaration: Rule;
1071110742
NoSpaceBeforeOpenParenInFuncCall: Rule;
1071210743
SpaceAfterFunctionInFuncDecl: Rule;
10744+
SpaceBeforeOpenParenInFuncDecl: Rule;
1071310745
NoSpaceBeforeOpenParenInFuncDecl: Rule;
1071410746
SpaceAfterVoidOperator: Rule;
1071510747
NoSpaceBetweenReturnAndSemicolon: Rule;
@@ -10718,6 +10750,7 @@ declare namespace ts.formatting {
1071810750
SpaceAfterGetSetInMember: Rule;
1071910751
SpaceBeforeBinaryKeywordOperator: Rule;
1072010752
SpaceAfterBinaryKeywordOperator: Rule;
10753+
SpaceAfterConstructor: Rule;
1072110754
NoSpaceAfterConstructor: Rule;
1072210755
NoSpaceAfterModuleImport: Rule;
1072310756
SpaceAfterCertainTypeScriptKeywords: Rule;

0 commit comments

Comments
 (0)