Skip to content

Commit a21a129

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into dynamicNames
2 parents 804c7d3 + 062e759 commit a21a129

204 files changed

Lines changed: 2493 additions & 1008 deletions

File tree

Some content is hidden

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

‎.gitmodules‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
[submodule "tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter"]
22
path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
33
url = https://github.com/Microsoft/TypeScript-React-Starter
4+
ignore = all
5+
shallow = true
46
[submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
57
path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
68
url = https://github.com/Microsoft/TypeScript-Node-Starter.git
9+
ignore = all
10+
shallow = true
711
[submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
812
path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
913
url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
14+
ignore = all
15+
shallow = true
1016
[submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
1117
path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
1218
url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
19+
ignore = all
20+
shallow = true
1321
[submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
1422
path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
1523
url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
24+
ignore = all
25+
shallow = true

‎src/compiler/builder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace ts {
7777
}
7878

7979
export interface BuilderOptions {
80-
getCanonicalFileName: (fileName: string) => string;
80+
getCanonicalFileName: GetCanonicalFileName;
8181
computeHash: (data: string) => string;
8282
}
8383

‎src/compiler/checker.ts‎

Lines changed: 200 additions & 147 deletions
Large diffs are not rendered by default.

‎src/compiler/commandLineParser.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@ namespace ts {
15401540
host: ParseConfigHost,
15411541
basePath: string,
15421542
configFileName: string,
1543-
getCanonicalFileName: (fileName: string) => string,
1543+
getCanonicalFileName: GetCanonicalFileName,
15441544
resolutionStack: Path[],
15451545
errors: Push<Diagnostic>,
15461546
): ParsedTsconfig {
@@ -1588,7 +1588,7 @@ namespace ts {
15881588
json: any,
15891589
host: ParseConfigHost,
15901590
basePath: string,
1591-
getCanonicalFileName: (fileName: string) => string,
1591+
getCanonicalFileName: GetCanonicalFileName,
15921592
configFileName: string | undefined,
15931593
errors: Push<Diagnostic>
15941594
): ParsedTsconfig {
@@ -1619,7 +1619,7 @@ namespace ts {
16191619
sourceFile: JsonSourceFile,
16201620
host: ParseConfigHost,
16211621
basePath: string,
1622-
getCanonicalFileName: (fileName: string) => string,
1622+
getCanonicalFileName: GetCanonicalFileName,
16231623
configFileName: string | undefined,
16241624
errors: Push<Diagnostic>
16251625
): ParsedTsconfig {
@@ -1688,7 +1688,7 @@ namespace ts {
16881688
extendedConfig: string,
16891689
host: ParseConfigHost,
16901690
basePath: string,
1691-
getCanonicalFileName: (fileName: string) => string,
1691+
getCanonicalFileName: GetCanonicalFileName,
16921692
errors: Push<Diagnostic>,
16931693
createDiagnostic: (message: DiagnosticMessage, arg1?: string) => Diagnostic) {
16941694
extendedConfig = normalizeSlashes(extendedConfig);
@@ -1713,7 +1713,7 @@ namespace ts {
17131713
extendedConfigPath: Path,
17141714
host: ts.ParseConfigHost,
17151715
basePath: string,
1716-
getCanonicalFileName: (fileName: string) => string,
1716+
getCanonicalFileName: GetCanonicalFileName,
17171717
resolutionStack: Path[],
17181718
errors: Push<Diagnostic>,
17191719
): ParsedTsconfig | undefined {

‎src/compiler/core.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ namespace ts {
20332033
}
20342034
}
20352035

2036-
export function getRelativePathToDirectoryOrUrl(directoryPathOrUrl: string, relativeOrAbsolutePath: string, currentDirectory: string, getCanonicalFileName: (fileName: string) => string, isAbsolutePathAnUrl: boolean) {
2036+
export function getRelativePathToDirectoryOrUrl(directoryPathOrUrl: string, relativeOrAbsolutePath: string, currentDirectory: string, getCanonicalFileName: GetCanonicalFileName, isAbsolutePathAnUrl: boolean) {
20372037
const pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
20382038
const directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
20392039
if (directoryComponents.length > 1 && lastOrUndefined(directoryComponents) === "") {
@@ -2819,7 +2819,8 @@ namespace ts {
28192819
}
28202820
}
28212821

2822-
export function createGetCanonicalFileName(useCaseSensitiveFileNames: boolean): (fileName: string) => string {
2822+
export type GetCanonicalFileName = (fileName: string) => string;
2823+
export function createGetCanonicalFileName(useCaseSensitiveFileNames: boolean): GetCanonicalFileName {
28232824
return useCaseSensitiveFileNames
28242825
? ((fileName) => fileName)
28252826
: ((fileName) => fileName.toLowerCase());

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3612,6 +3612,10 @@
36123612
"category": "Error",
36133613
"code": 8027
36143614
},
3615+
"JSDoc '...' may only appear in the last parameter of a signature.": {
3616+
"category": "Error",
3617+
"code": 8028
3618+
},
36153619
"Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause.": {
36163620
"category": "Error",
36173621
"code": 9002

‎src/compiler/factory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3711,7 +3711,7 @@ namespace ts {
37113711
while (statementOffset < numStatements) {
37123712
const statement = source[statementOffset];
37133713
if (getEmitFlags(statement) & EmitFlags.CustomPrologue) {
3714-
target.push(visitor ? visitNode(statement, visitor, isStatement) : statement);
3714+
append(target, visitor ? visitNode(statement, visitor, isStatement) : statement);
37153715
}
37163716
else {
37173717
break;

0 commit comments

Comments
 (0)