Skip to content

Commit dbf69b7

Browse files
mhegazymhegazy
committed
Update LKG
1 parent 17735cd commit dbf69b7

File tree

7 files changed

+243
-176
lines changed

7 files changed

+243
-176
lines changed

‎lib/tsc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37138,7 +37138,7 @@ var ts;
3713837138
})(ts || (ts = {}));
3713937139
var ts;
3714037140
(function (ts) {
37141-
ts.version = "2.0.6";
37141+
ts.version = "2.0.7";
3714237142
var emptyArray = [];
3714337143
function findConfigFile(searchPath, fileExists, configName) {
3714437144
if (configName === void 0) { configName = "tsconfig.json"; }

‎lib/tsserver.js

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38527,7 +38527,7 @@ var ts;
3852738527
})(ts || (ts = {}));
3852838528
var ts;
3852938529
(function (ts) {
38530-
ts.version = "2.0.6";
38530+
ts.version = "2.0.7";
3853138531
var emptyArray = [];
3853238532
function findConfigFile(searchPath, fileExists, configName) {
3853338533
if (configName === void 0) { configName = "tsconfig.json"; }
@@ -43823,6 +43823,9 @@ var ts;
4382343823
return this.rulesMap;
4382443824
};
4382543825
RulesProvider.prototype.ensureUpToDate = function (options) {
43826+
this.ensureUpToDateWorker(ts.toEditorSettings(options));
43827+
};
43828+
RulesProvider.prototype.ensureUpToDateWorker = function (options) {
4382643829
if (!this.options || !ts.compareDataObjects(this.options, options)) {
4382743830
var activeRules = this.createActiveRules(options);
4382843831
var rulesMap = formatting.RulesMap.create(activeRules);
@@ -43921,6 +43924,10 @@ var ts;
4392143924
var formatting;
4392243925
(function (formatting) {
4392343926
function formatOnEnter(position, sourceFile, rulesProvider, options) {
43927+
return formatOnEnterWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
43928+
}
43929+
formatting.formatOnEnter = formatOnEnter;
43930+
function formatOnEnterWorker(position, sourceFile, rulesProvider, options) {
4392443931
var line = sourceFile.getLineAndCharacterOfPosition(position).line;
4392543932
if (line === 0) {
4392643933
return [];
@@ -43938,31 +43945,47 @@ var ts;
4393843945
};
4393943946
return formatSpan(span, sourceFile, options, rulesProvider, 2);
4394043947
}
43941-
formatting.formatOnEnter = formatOnEnter;
43948+
formatting.formatOnEnterWorker = formatOnEnterWorker;
4394243949
function formatOnSemicolon(position, sourceFile, rulesProvider, options) {
43943-
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
43950+
return formatOnSemicolonWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
4394443951
}
4394543952
formatting.formatOnSemicolon = formatOnSemicolon;
43953+
function formatOnSemicolonWorker(position, sourceFile, rulesProvider, options) {
43954+
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
43955+
}
43956+
formatting.formatOnSemicolonWorker = formatOnSemicolonWorker;
4394643957
function formatOnClosingCurly(position, sourceFile, rulesProvider, options) {
43947-
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
43958+
return formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
4394843959
}
4394943960
formatting.formatOnClosingCurly = formatOnClosingCurly;
43961+
function formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, options) {
43962+
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
43963+
}
43964+
formatting.formatOnClosingCurlyWorker = formatOnClosingCurlyWorker;
4395043965
function formatDocument(sourceFile, rulesProvider, options) {
43966+
return formatDocumentWorker(sourceFile, rulesProvider, ts.toEditorSettings(options));
43967+
}
43968+
formatting.formatDocument = formatDocument;
43969+
function formatDocumentWorker(sourceFile, rulesProvider, options) {
4395143970
var span = {
4395243971
pos: 0,
4395343972
end: sourceFile.text.length
4395443973
};
4395543974
return formatSpan(span, sourceFile, options, rulesProvider, 0);
4395643975
}
43957-
formatting.formatDocument = formatDocument;
43976+
formatting.formatDocumentWorker = formatDocumentWorker;
4395843977
function formatSelection(start, end, sourceFile, rulesProvider, options) {
43978+
return formatSelectionWorker(start, end, sourceFile, rulesProvider, ts.toEditorSettings(options));
43979+
}
43980+
formatting.formatSelection = formatSelection;
43981+
function formatSelectionWorker(start, end, sourceFile, rulesProvider, options) {
4395943982
var span = {
4396043983
pos: ts.getLineStartPositionForPosition(start, sourceFile),
4396143984
end: end
4396243985
};
4396343986
return formatSpan(span, sourceFile, options, rulesProvider, 1);
4396443987
}
43965-
formatting.formatSelection = formatSelection;
43988+
formatting.formatSelectionWorker = formatSelectionWorker;
4396643989
function formatOutermostParent(position, expectedLastToken, sourceFile, options, rulesProvider, requestKind) {
4396743990
var parent = findOutermostParent(position, expectedLastToken, sourceFile);
4396843991
if (!parent) {
@@ -46888,7 +46911,7 @@ var ts;
4688846911
if (!ruleProvider) {
4688946912
ruleProvider = new ts.formatting.RulesProvider();
4689046913
}
46891-
ruleProvider.ensureUpToDate(options);
46914+
ruleProvider.ensureUpToDateWorker(options);
4689246915
return ruleProvider;
4689346916
}
4689446917
function synchronizeHostData() {
@@ -50857,24 +50880,24 @@ var ts;
5085750880
function getFormattingEditsForRange(fileName, start, end, optionsOrSettings) {
5085850881
var settings = toEditorSettings(optionsOrSettings);
5085950882
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
50860-
return ts.formatting.formatSelection(start, end, sourceFile, getRuleProvider(settings), settings);
50883+
return ts.formatting.formatSelectionWorker(start, end, sourceFile, getRuleProvider(settings), settings);
5086150884
}
5086250885
function getFormattingEditsForDocument(fileName, optionsOrSettings) {
5086350886
var settings = toEditorSettings(optionsOrSettings);
5086450887
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
50865-
return ts.formatting.formatDocument(sourceFile, getRuleProvider(settings), settings);
50888+
return ts.formatting.formatDocumentWorker(sourceFile, getRuleProvider(settings), settings);
5086650889
}
5086750890
function getFormattingEditsAfterKeystroke(fileName, position, key, optionsOrSettings) {
5086850891
var settings = toEditorSettings(optionsOrSettings);
5086950892
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
5087050893
if (key === "}") {
50871-
return ts.formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(settings), settings);
50894+
return ts.formatting.formatOnClosingCurlyWorker(position, sourceFile, getRuleProvider(settings), settings);
5087250895
}
5087350896
else if (key === ";") {
50874-
return ts.formatting.formatOnSemicolon(position, sourceFile, getRuleProvider(settings), settings);
50897+
return ts.formatting.formatOnSemicolonWorker(position, sourceFile, getRuleProvider(settings), settings);
5087550898
}
5087650899
else if (key === "\n") {
50877-
return ts.formatting.formatOnEnter(position, sourceFile, getRuleProvider(settings), settings);
50900+
return ts.formatting.formatOnEnterWorker(position, sourceFile, getRuleProvider(settings), settings);
5087850901
}
5087950902
return [];
5088050903
}

‎lib/tsserverlibrary.d.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8739,7 +8739,8 @@ declare namespace ts.formatting {
87398739
getRuleName(rule: Rule): string;
87408740
getRuleByName(name: string): Rule;
87418741
getRulesMap(): RulesMap;
8742-
ensureUpToDate(options: ts.FormatCodeSettings): void;
8742+
ensureUpToDate(options: ts.FormatCodeSettings | ts.FormatCodeOptions): void;
8743+
ensureUpToDateWorker(options: ts.FormatCodeSettings): void;
87438744
private createActiveRules(options);
87448745
}
87458746
}
@@ -8752,11 +8753,16 @@ declare namespace ts.formatting {
87528753
token: TextRangeWithKind;
87538754
trailingTrivia: TextRangeWithKind[];
87548755
}
8755-
function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8756-
function formatOnSemicolon(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8757-
function formatOnClosingCurly(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8758-
function formatDocument(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8759-
function formatSelection(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8756+
function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
8757+
function formatOnEnterWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8758+
function formatOnSemicolon(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
8759+
function formatOnSemicolonWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8760+
function formatOnClosingCurly(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
8761+
function formatOnClosingCurlyWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8762+
function formatDocument(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
8763+
function formatDocumentWorker(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
8764+
function formatSelection(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
8765+
function formatSelectionWorker(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
87608766
function getIndentationString(indentation: number, options: EditorSettings): string;
87618767
}
87628768
declare namespace ts.formatting {

‎lib/tsserverlibrary.js

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38527,7 +38527,7 @@ var ts;
3852738527
})(ts || (ts = {}));
3852838528
var ts;
3852938529
(function (ts) {
38530-
ts.version = "2.0.6";
38530+
ts.version = "2.0.7";
3853138531
var emptyArray = [];
3853238532
function findConfigFile(searchPath, fileExists, configName) {
3853338533
if (configName === void 0) { configName = "tsconfig.json"; }
@@ -43823,6 +43823,9 @@ var ts;
4382343823
return this.rulesMap;
4382443824
};
4382543825
RulesProvider.prototype.ensureUpToDate = function (options) {
43826+
this.ensureUpToDateWorker(ts.toEditorSettings(options));
43827+
};
43828+
RulesProvider.prototype.ensureUpToDateWorker = function (options) {
4382643829
if (!this.options || !ts.compareDataObjects(this.options, options)) {
4382743830
var activeRules = this.createActiveRules(options);
4382843831
var rulesMap = formatting.RulesMap.create(activeRules);
@@ -43921,6 +43924,10 @@ var ts;
4392143924
var formatting;
4392243925
(function (formatting) {
4392343926
function formatOnEnter(position, sourceFile, rulesProvider, options) {
43927+
return formatOnEnterWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
43928+
}
43929+
formatting.formatOnEnter = formatOnEnter;
43930+
function formatOnEnterWorker(position, sourceFile, rulesProvider, options) {
4392443931
var line = sourceFile.getLineAndCharacterOfPosition(position).line;
4392543932
if (line === 0) {
4392643933
return [];
@@ -43938,31 +43945,47 @@ var ts;
4393843945
};
4393943946
return formatSpan(span, sourceFile, options, rulesProvider, 2);
4394043947
}
43941-
formatting.formatOnEnter = formatOnEnter;
43948+
formatting.formatOnEnterWorker = formatOnEnterWorker;
4394243949
function formatOnSemicolon(position, sourceFile, rulesProvider, options) {
43943-
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
43950+
return formatOnSemicolonWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
4394443951
}
4394543952
formatting.formatOnSemicolon = formatOnSemicolon;
43953+
function formatOnSemicolonWorker(position, sourceFile, rulesProvider, options) {
43954+
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
43955+
}
43956+
formatting.formatOnSemicolonWorker = formatOnSemicolonWorker;
4394643957
function formatOnClosingCurly(position, sourceFile, rulesProvider, options) {
43947-
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
43958+
return formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
4394843959
}
4394943960
formatting.formatOnClosingCurly = formatOnClosingCurly;
43961+
function formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, options) {
43962+
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
43963+
}
43964+
formatting.formatOnClosingCurlyWorker = formatOnClosingCurlyWorker;
4395043965
function formatDocument(sourceFile, rulesProvider, options) {
43966+
return formatDocumentWorker(sourceFile, rulesProvider, ts.toEditorSettings(options));
43967+
}
43968+
formatting.formatDocument = formatDocument;
43969+
function formatDocumentWorker(sourceFile, rulesProvider, options) {
4395143970
var span = {
4395243971
pos: 0,
4395343972
end: sourceFile.text.length
4395443973
};
4395543974
return formatSpan(span, sourceFile, options, rulesProvider, 0);
4395643975
}
43957-
formatting.formatDocument = formatDocument;
43976+
formatting.formatDocumentWorker = formatDocumentWorker;
4395843977
function formatSelection(start, end, sourceFile, rulesProvider, options) {
43978+
return formatSelectionWorker(start, end, sourceFile, rulesProvider, ts.toEditorSettings(options));
43979+
}
43980+
formatting.formatSelection = formatSelection;
43981+
function formatSelectionWorker(start, end, sourceFile, rulesProvider, options) {
4395943982
var span = {
4396043983
pos: ts.getLineStartPositionForPosition(start, sourceFile),
4396143984
end: end
4396243985
};
4396343986
return formatSpan(span, sourceFile, options, rulesProvider, 1);
4396443987
}
43965-
formatting.formatSelection = formatSelection;
43988+
formatting.formatSelectionWorker = formatSelectionWorker;
4396643989
function formatOutermostParent(position, expectedLastToken, sourceFile, options, rulesProvider, requestKind) {
4396743990
var parent = findOutermostParent(position, expectedLastToken, sourceFile);
4396843991
if (!parent) {
@@ -46888,7 +46911,7 @@ var ts;
4688846911
if (!ruleProvider) {
4688946912
ruleProvider = new ts.formatting.RulesProvider();
4689046913
}
46891-
ruleProvider.ensureUpToDate(options);
46914+
ruleProvider.ensureUpToDateWorker(options);
4689246915
return ruleProvider;
4689346916
}
4689446917
function synchronizeHostData() {
@@ -50857,24 +50880,24 @@ var ts;
5085750880
function getFormattingEditsForRange(fileName, start, end, optionsOrSettings) {
5085850881
var settings = toEditorSettings(optionsOrSettings);
5085950882
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
50860-
return ts.formatting.formatSelection(start, end, sourceFile, getRuleProvider(settings), settings);
50883+
return ts.formatting.formatSelectionWorker(start, end, sourceFile, getRuleProvider(settings), settings);
5086150884
}
5086250885
function getFormattingEditsForDocument(fileName, optionsOrSettings) {
5086350886
var settings = toEditorSettings(optionsOrSettings);
5086450887
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
50865-
return ts.formatting.formatDocument(sourceFile, getRuleProvider(settings), settings);
50888+
return ts.formatting.formatDocumentWorker(sourceFile, getRuleProvider(settings), settings);
5086650889
}
5086750890
function getFormattingEditsAfterKeystroke(fileName, position, key, optionsOrSettings) {
5086850891
var settings = toEditorSettings(optionsOrSettings);
5086950892
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
5087050893
if (key === "}") {
50871-
return ts.formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(settings), settings);
50894+
return ts.formatting.formatOnClosingCurlyWorker(position, sourceFile, getRuleProvider(settings), settings);
5087250895
}
5087350896
else if (key === ";") {
50874-
return ts.formatting.formatOnSemicolon(position, sourceFile, getRuleProvider(settings), settings);
50897+
return ts.formatting.formatOnSemicolonWorker(position, sourceFile, getRuleProvider(settings), settings);
5087550898
}
5087650899
else if (key === "\n") {
50877-
return ts.formatting.formatOnEnter(position, sourceFile, getRuleProvider(settings), settings);
50900+
return ts.formatting.formatOnEnterWorker(position, sourceFile, getRuleProvider(settings), settings);
5087850901
}
5087950902
return [];
5088050903
}

0 commit comments

Comments
 (0)