Skip to content

Commit 2312c09

Browse files
DanielRosenwasserDanielRosenwasser
committed
Update LKG.
1 parent 670c480 commit 2312c09

File tree

10 files changed

+145
-37
lines changed

10 files changed

+145
-37
lines changed

‎lib/protocol.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,7 @@ declare namespace ts.server.protocol {
22652265
}
22662266
interface UserPreferences {
22672267
readonly disableSuggestions?: boolean;
2268-
readonly quotePreference?: "double" | "single";
2268+
readonly quotePreference?: "auto" | "double" | "single";
22692269
/**
22702270
* If enabled, TypeScript will search through all external modules' exports and add them to the completions list.
22712271
* This affects lone identifier completions but not completions on the right hand side of `obj.`.

‎lib/tsc.js‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6161
var ts;
6262
(function (ts) {
6363
ts.versionMajorMinor = "3.3";
64-
ts.version = ts.versionMajorMinor + ".1";
64+
ts.version = ts.versionMajorMinor + ".3";
6565
})(ts || (ts = {}));
6666
(function (ts) {
6767
ts.emptyArray = [];
@@ -48476,7 +48476,7 @@ var ts;
4847648476
return;
4847748477
}
4847848478
var file = host.getSourceFile(resolvedDirective.resolvedFileName);
48479-
fileToDirective.set(file.path, key);
48479+
addReferencedFilesToTypeDirective(file, key);
4848048480
});
4848148481
}
4848248482
return {
@@ -48615,6 +48615,19 @@ var ts;
4861548615
}
4861648616
return false;
4861748617
}
48618+
function addReferencedFilesToTypeDirective(file, key) {
48619+
if (fileToDirective.has(file.path))
48620+
return;
48621+
fileToDirective.set(file.path, key);
48622+
for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
48623+
var fileName = _a[_i].fileName;
48624+
var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName);
48625+
var referencedFile = host.getSourceFile(resolvedFile);
48626+
if (referencedFile) {
48627+
addReferencedFilesToTypeDirective(referencedFile, key);
48628+
}
48629+
}
48630+
}
4861848631
}
4861948632
function getExternalModuleFileFromDeclaration(declaration) {
4862048633
var specifier = declaration.kind === 244 ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);

‎lib/tsserver.js‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var ts;
8888
// If changing the text in this section, be sure to test `configureNightly` too.
8989
ts.versionMajorMinor = "3.3";
9090
/** The version of the TypeScript compiler release */
91-
ts.version = ts.versionMajorMinor + ".1";
91+
ts.version = ts.versionMajorMinor + ".3";
9292
})(ts || (ts = {}));
9393
(function (ts) {
9494
/* @internal */
@@ -57874,7 +57874,9 @@ var ts;
5787457874
return;
5787557875
}
5787657876
var file = host.getSourceFile(resolvedDirective.resolvedFileName);
57877-
fileToDirective.set(file.path, key);
57877+
// Add the transitive closure of path references loaded by this file (as long as they are not)
57878+
// part of an existing type reference.
57879+
addReferencedFilesToTypeDirective(file, key);
5787857880
});
5787957881
}
5788057882
return {
@@ -58029,6 +58031,19 @@ var ts;
5802958031
}
5803058032
return false;
5803158033
}
58034+
function addReferencedFilesToTypeDirective(file, key) {
58035+
if (fileToDirective.has(file.path))
58036+
return;
58037+
fileToDirective.set(file.path, key);
58038+
for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
58039+
var fileName = _a[_i].fileName;
58040+
var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName);
58041+
var referencedFile = host.getSourceFile(resolvedFile);
58042+
if (referencedFile) {
58043+
addReferencedFilesToTypeDirective(referencedFile, key);
58044+
}
58045+
}
58046+
}
5803258047
}
5803358048
function getExternalModuleFileFromDeclaration(declaration) {
5803458049
var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
@@ -94462,7 +94477,7 @@ var ts;
9446294477
}
9446394478
ts.quotePreferenceFromString = quotePreferenceFromString;
9446494479
function getQuotePreference(sourceFile, preferences) {
94465-
if (preferences.quotePreference) {
94480+
if (preferences.quotePreference && preferences.quotePreference !== "auto") {
9446694481
return preferences.quotePreference === "single" ? 0 /* Single */ : 1 /* Double */;
9446794482
}
9446894483
else {
@@ -95033,15 +95048,18 @@ var ts;
9503395048
if (/^\d+$/.test(text)) {
9503495049
return text;
9503595050
}
95051+
// Editors can pass in undefined or empty string - we want to infer the preference in those cases.
95052+
var quotePreference = preferences.quotePreference || "auto";
9503695053
var quoted = JSON.stringify(text);
95037-
switch (preferences.quotePreference) {
95038-
case undefined:
95054+
switch (quotePreference) {
95055+
// TODO use getQuotePreference to infer the actual quote style.
95056+
case "auto":
9503995057
case "double":
9504095058
return quoted;
9504195059
case "single":
9504295060
return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
9504395061
default:
95044-
return ts.Debug.assertNever(preferences.quotePreference);
95062+
return ts.Debug.assertNever(quotePreference);
9504595063
}
9504695064
}
9504795065
ts.quote = quote;
@@ -113925,7 +113943,9 @@ var ts;
113925113943
}
113926113944
function createStubbedMethodBody(preferences) {
113927113945
return ts.createBlock([ts.createThrow(ts.createNew(ts.createIdentifier("Error"),
113928-
/*typeArguments*/ undefined, [ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
113946+
/*typeArguments*/ undefined,
113947+
// TODO Handle auto quote preference.
113948+
[ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
113929113949
/*multiline*/ true);
113930113950
}
113931113951
function createVisibilityModifier(flags) {

‎lib/tsserverlibrary.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,7 @@ declare namespace ts {
30093009
}
30103010
interface UserPreferences {
30113011
readonly disableSuggestions?: boolean;
3012-
readonly quotePreference?: "double" | "single";
3012+
readonly quotePreference?: "auto" | "double" | "single";
30133013
readonly includeCompletionsForModuleExports?: boolean;
30143014
readonly includeCompletionsWithInsertText?: boolean;
30153015
readonly importModuleSpecifierPreference?: "relative" | "non-relative";
@@ -7925,7 +7925,7 @@ declare namespace ts.server.protocol {
79257925
}
79267926
interface UserPreferences {
79277927
readonly disableSuggestions?: boolean;
7928-
readonly quotePreference?: "double" | "single";
7928+
readonly quotePreference?: "auto" | "double" | "single";
79297929
/**
79307930
* If enabled, TypeScript will search through all external modules' exports and add them to the completions list.
79317931
* This affects lone identifier completions but not completions on the right hand side of `obj.`.

‎lib/tsserverlibrary.js‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ var ts;
8484
// If changing the text in this section, be sure to test `configureNightly` too.
8585
ts.versionMajorMinor = "3.3";
8686
/** The version of the TypeScript compiler release */
87-
ts.version = ts.versionMajorMinor + ".1";
87+
ts.version = ts.versionMajorMinor + ".3";
8888
})(ts || (ts = {}));
8989
(function (ts) {
9090
/* @internal */
@@ -57870,7 +57870,9 @@ var ts;
5787057870
return;
5787157871
}
5787257872
var file = host.getSourceFile(resolvedDirective.resolvedFileName);
57873-
fileToDirective.set(file.path, key);
57873+
// Add the transitive closure of path references loaded by this file (as long as they are not)
57874+
// part of an existing type reference.
57875+
addReferencedFilesToTypeDirective(file, key);
5787457876
});
5787557877
}
5787657878
return {
@@ -58025,6 +58027,19 @@ var ts;
5802558027
}
5802658028
return false;
5802758029
}
58030+
function addReferencedFilesToTypeDirective(file, key) {
58031+
if (fileToDirective.has(file.path))
58032+
return;
58033+
fileToDirective.set(file.path, key);
58034+
for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
58035+
var fileName = _a[_i].fileName;
58036+
var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName);
58037+
var referencedFile = host.getSourceFile(resolvedFile);
58038+
if (referencedFile) {
58039+
addReferencedFilesToTypeDirective(referencedFile, key);
58040+
}
58041+
}
58042+
}
5802858043
}
5802958044
function getExternalModuleFileFromDeclaration(declaration) {
5803058045
var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
@@ -94772,7 +94787,7 @@ var ts;
9477294787
}
9477394788
ts.quotePreferenceFromString = quotePreferenceFromString;
9477494789
function getQuotePreference(sourceFile, preferences) {
94775-
if (preferences.quotePreference) {
94790+
if (preferences.quotePreference && preferences.quotePreference !== "auto") {
9477694791
return preferences.quotePreference === "single" ? 0 /* Single */ : 1 /* Double */;
9477794792
}
9477894793
else {
@@ -95343,15 +95358,18 @@ var ts;
9534395358
if (/^\d+$/.test(text)) {
9534495359
return text;
9534595360
}
95361+
// Editors can pass in undefined or empty string - we want to infer the preference in those cases.
95362+
var quotePreference = preferences.quotePreference || "auto";
9534695363
var quoted = JSON.stringify(text);
95347-
switch (preferences.quotePreference) {
95348-
case undefined:
95364+
switch (quotePreference) {
95365+
// TODO use getQuotePreference to infer the actual quote style.
95366+
case "auto":
9534995367
case "double":
9535095368
return quoted;
9535195369
case "single":
9535295370
return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
9535395371
default:
95354-
return ts.Debug.assertNever(preferences.quotePreference);
95372+
return ts.Debug.assertNever(quotePreference);
9535595373
}
9535695374
}
9535795375
ts.quote = quote;
@@ -114235,7 +114253,9 @@ var ts;
114235114253
}
114236114254
function createStubbedMethodBody(preferences) {
114237114255
return ts.createBlock([ts.createThrow(ts.createNew(ts.createIdentifier("Error"),
114238-
/*typeArguments*/ undefined, [ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
114256+
/*typeArguments*/ undefined,
114257+
// TODO Handle auto quote preference.
114258+
[ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
114239114259
/*multiline*/ true);
114240114260
}
114241114261
function createVisibilityModifier(flags) {

‎lib/typescript.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,7 @@ declare namespace ts {
30093009
}
30103010
interface UserPreferences {
30113011
readonly disableSuggestions?: boolean;
3012-
readonly quotePreference?: "double" | "single";
3012+
readonly quotePreference?: "auto" | "double" | "single";
30133013
readonly includeCompletionsForModuleExports?: boolean;
30143014
readonly includeCompletionsWithInsertText?: boolean;
30153015
readonly importModuleSpecifierPreference?: "relative" | "non-relative";

‎lib/typescript.js‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var ts;
7575
// If changing the text in this section, be sure to test `configureNightly` too.
7676
ts.versionMajorMinor = "3.3";
7777
/** The version of the TypeScript compiler release */
78-
ts.version = ts.versionMajorMinor + ".1";
78+
ts.version = ts.versionMajorMinor + ".3";
7979
})(ts || (ts = {}));
8080
(function (ts) {
8181
/* @internal */
@@ -57861,7 +57861,9 @@ var ts;
5786157861
return;
5786257862
}
5786357863
var file = host.getSourceFile(resolvedDirective.resolvedFileName);
57864-
fileToDirective.set(file.path, key);
57864+
// Add the transitive closure of path references loaded by this file (as long as they are not)
57865+
// part of an existing type reference.
57866+
addReferencedFilesToTypeDirective(file, key);
5786557867
});
5786657868
}
5786757869
return {
@@ -58016,6 +58018,19 @@ var ts;
5801658018
}
5801758019
return false;
5801858020
}
58021+
function addReferencedFilesToTypeDirective(file, key) {
58022+
if (fileToDirective.has(file.path))
58023+
return;
58024+
fileToDirective.set(file.path, key);
58025+
for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
58026+
var fileName = _a[_i].fileName;
58027+
var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName);
58028+
var referencedFile = host.getSourceFile(resolvedFile);
58029+
if (referencedFile) {
58030+
addReferencedFilesToTypeDirective(referencedFile, key);
58031+
}
58032+
}
58033+
}
5801958034
}
5802058035
function getExternalModuleFileFromDeclaration(declaration) {
5802158036
var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
@@ -94763,7 +94778,7 @@ var ts;
9476394778
}
9476494779
ts.quotePreferenceFromString = quotePreferenceFromString;
9476594780
function getQuotePreference(sourceFile, preferences) {
94766-
if (preferences.quotePreference) {
94781+
if (preferences.quotePreference && preferences.quotePreference !== "auto") {
9476794782
return preferences.quotePreference === "single" ? 0 /* Single */ : 1 /* Double */;
9476894783
}
9476994784
else {
@@ -95334,15 +95349,18 @@ var ts;
9533495349
if (/^\d+$/.test(text)) {
9533595350
return text;
9533695351
}
95352+
// Editors can pass in undefined or empty string - we want to infer the preference in those cases.
95353+
var quotePreference = preferences.quotePreference || "auto";
9533795354
var quoted = JSON.stringify(text);
95338-
switch (preferences.quotePreference) {
95339-
case undefined:
95355+
switch (quotePreference) {
95356+
// TODO use getQuotePreference to infer the actual quote style.
95357+
case "auto":
9534095358
case "double":
9534195359
return quoted;
9534295360
case "single":
9534395361
return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
9534495362
default:
95345-
return ts.Debug.assertNever(preferences.quotePreference);
95363+
return ts.Debug.assertNever(quotePreference);
9534695364
}
9534795365
}
9534895366
ts.quote = quote;
@@ -114226,7 +114244,9 @@ var ts;
114226114244
}
114227114245
function createStubbedMethodBody(preferences) {
114228114246
return ts.createBlock([ts.createThrow(ts.createNew(ts.createIdentifier("Error"),
114229-
/*typeArguments*/ undefined, [ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
114247+
/*typeArguments*/ undefined,
114248+
// TODO Handle auto quote preference.
114249+
[ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))],
114230114250
/*multiline*/ true);
114231114251
}
114232114252
function createVisibilityModifier(flags) {

‎lib/typescriptServices.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,7 @@ declare namespace ts {
30093009
}
30103010
interface UserPreferences {
30113011
readonly disableSuggestions?: boolean;
3012-
readonly quotePreference?: "double" | "single";
3012+
readonly quotePreference?: "auto" | "double" | "single";
30133013
readonly includeCompletionsForModuleExports?: boolean;
30143014
readonly includeCompletionsWithInsertText?: boolean;
30153015
readonly importModuleSpecifierPreference?: "relative" | "non-relative";

0 commit comments

Comments
 (0)