Skip to content

Commit

Permalink
Update LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhegazy
mhegazy committed Nov 3, 2016
1 parent 17735cd commit dbf69b7
Show file tree
Hide file tree
Showing 7 changed files with 243 additions and 176 deletions.
2 changes: 1 addition & 1 deletion lib/tsc.js
View file
Expand Up @@ -37138,7 +37138,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.6";
ts.version = "2.0.7";
var emptyArray = [];
function findConfigFile(searchPath, fileExists, configName) {
if (configName === void 0) { configName = "tsconfig.json"; }
Expand Down
47 changes: 35 additions & 12 deletions lib/tsserver.js
View file
Expand Up @@ -38527,7 +38527,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.6";
ts.version = "2.0.7";
var emptyArray = [];
function findConfigFile(searchPath, fileExists, configName) {
if (configName === void 0) { configName = "tsconfig.json"; }
Expand Down Expand Up @@ -43823,6 +43823,9 @@ var ts;
return this.rulesMap;
};
RulesProvider.prototype.ensureUpToDate = function (options) {
this.ensureUpToDateWorker(ts.toEditorSettings(options));
};
RulesProvider.prototype.ensureUpToDateWorker = function (options) {
if (!this.options || !ts.compareDataObjects(this.options, options)) {
var activeRules = this.createActiveRules(options);
var rulesMap = formatting.RulesMap.create(activeRules);
Expand Down Expand Up @@ -43921,6 +43924,10 @@ var ts;
var formatting;
(function (formatting) {
function formatOnEnter(position, sourceFile, rulesProvider, options) {
return formatOnEnterWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnEnter = formatOnEnter;
function formatOnEnterWorker(position, sourceFile, rulesProvider, options) {
var line = sourceFile.getLineAndCharacterOfPosition(position).line;
if (line === 0) {
return [];
Expand All @@ -43938,31 +43945,47 @@ var ts;
};
return formatSpan(span, sourceFile, options, rulesProvider, 2);
}
formatting.formatOnEnter = formatOnEnter;
formatting.formatOnEnterWorker = formatOnEnterWorker;
function formatOnSemicolon(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
return formatOnSemicolonWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnSemicolon = formatOnSemicolon;
function formatOnSemicolonWorker(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
}
formatting.formatOnSemicolonWorker = formatOnSemicolonWorker;
function formatOnClosingCurly(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
return formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnClosingCurly = formatOnClosingCurly;
function formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
}
formatting.formatOnClosingCurlyWorker = formatOnClosingCurlyWorker;
function formatDocument(sourceFile, rulesProvider, options) {
return formatDocumentWorker(sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatDocument = formatDocument;
function formatDocumentWorker(sourceFile, rulesProvider, options) {
var span = {
pos: 0,
end: sourceFile.text.length
};
return formatSpan(span, sourceFile, options, rulesProvider, 0);
}
formatting.formatDocument = formatDocument;
formatting.formatDocumentWorker = formatDocumentWorker;
function formatSelection(start, end, sourceFile, rulesProvider, options) {
return formatSelectionWorker(start, end, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatSelection = formatSelection;
function formatSelectionWorker(start, end, sourceFile, rulesProvider, options) {
var span = {
pos: ts.getLineStartPositionForPosition(start, sourceFile),
end: end
};
return formatSpan(span, sourceFile, options, rulesProvider, 1);
}
formatting.formatSelection = formatSelection;
formatting.formatSelectionWorker = formatSelectionWorker;
function formatOutermostParent(position, expectedLastToken, sourceFile, options, rulesProvider, requestKind) {
var parent = findOutermostParent(position, expectedLastToken, sourceFile);
if (!parent) {
Expand Down Expand Up @@ -46888,7 +46911,7 @@ var ts;
if (!ruleProvider) {
ruleProvider = new ts.formatting.RulesProvider();
}
ruleProvider.ensureUpToDate(options);
ruleProvider.ensureUpToDateWorker(options);
return ruleProvider;
}
function synchronizeHostData() {
Expand Down Expand Up @@ -50857,24 +50880,24 @@ var ts;
function getFormattingEditsForRange(fileName, start, end, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
return ts.formatting.formatSelection(start, end, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatSelectionWorker(start, end, sourceFile, getRuleProvider(settings), settings);
}
function getFormattingEditsForDocument(fileName, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
return ts.formatting.formatDocument(sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatDocumentWorker(sourceFile, getRuleProvider(settings), settings);
}
function getFormattingEditsAfterKeystroke(fileName, position, key, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
if (key === "}") {
return ts.formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnClosingCurlyWorker(position, sourceFile, getRuleProvider(settings), settings);
}
else if (key === ";") {
return ts.formatting.formatOnSemicolon(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnSemicolonWorker(position, sourceFile, getRuleProvider(settings), settings);
}
else if (key === "\n") {
return ts.formatting.formatOnEnter(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnEnterWorker(position, sourceFile, getRuleProvider(settings), settings);
}
return [];
}
Expand Down
18 changes: 12 additions & 6 deletions lib/tsserverlibrary.d.ts
View file
Expand Up @@ -8739,7 +8739,8 @@ declare namespace ts.formatting {
getRuleName(rule: Rule): string;
getRuleByName(name: string): Rule;
getRulesMap(): RulesMap;
ensureUpToDate(options: ts.FormatCodeSettings): void;
ensureUpToDate(options: ts.FormatCodeSettings | ts.FormatCodeOptions): void;
ensureUpToDateWorker(options: ts.FormatCodeSettings): void;
private createActiveRules(options);
}
}
Expand All @@ -8752,11 +8753,16 @@ declare namespace ts.formatting {
token: TextRangeWithKind;
trailingTrivia: TextRangeWithKind[];
}
function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatOnSemicolon(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatOnClosingCurly(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatDocument(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatSelection(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
function formatOnEnterWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatOnSemicolon(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
function formatOnSemicolonWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatOnClosingCurly(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
function formatOnClosingCurlyWorker(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatDocument(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
function formatDocumentWorker(sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function formatSelection(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings | FormatCodeOptions): TextChange[];
function formatSelectionWorker(start: number, end: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeSettings): TextChange[];
function getIndentationString(indentation: number, options: EditorSettings): string;
}
declare namespace ts.formatting {
Expand Down
47 changes: 35 additions & 12 deletions lib/tsserverlibrary.js
View file
Expand Up @@ -38527,7 +38527,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.0.6";
ts.version = "2.0.7";
var emptyArray = [];
function findConfigFile(searchPath, fileExists, configName) {
if (configName === void 0) { configName = "tsconfig.json"; }
Expand Down Expand Up @@ -43823,6 +43823,9 @@ var ts;
return this.rulesMap;
};
RulesProvider.prototype.ensureUpToDate = function (options) {
this.ensureUpToDateWorker(ts.toEditorSettings(options));
};
RulesProvider.prototype.ensureUpToDateWorker = function (options) {
if (!this.options || !ts.compareDataObjects(this.options, options)) {
var activeRules = this.createActiveRules(options);
var rulesMap = formatting.RulesMap.create(activeRules);
Expand Down Expand Up @@ -43921,6 +43924,10 @@ var ts;
var formatting;
(function (formatting) {
function formatOnEnter(position, sourceFile, rulesProvider, options) {
return formatOnEnterWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnEnter = formatOnEnter;
function formatOnEnterWorker(position, sourceFile, rulesProvider, options) {
var line = sourceFile.getLineAndCharacterOfPosition(position).line;
if (line === 0) {
return [];
Expand All @@ -43938,31 +43945,47 @@ var ts;
};
return formatSpan(span, sourceFile, options, rulesProvider, 2);
}
formatting.formatOnEnter = formatOnEnter;
formatting.formatOnEnterWorker = formatOnEnterWorker;
function formatOnSemicolon(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
return formatOnSemicolonWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnSemicolon = formatOnSemicolon;
function formatOnSemicolonWorker(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 23, sourceFile, options, rulesProvider, 3);
}
formatting.formatOnSemicolonWorker = formatOnSemicolonWorker;
function formatOnClosingCurly(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
return formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatOnClosingCurly = formatOnClosingCurly;
function formatOnClosingCurlyWorker(position, sourceFile, rulesProvider, options) {
return formatOutermostParent(position, 16, sourceFile, options, rulesProvider, 4);
}
formatting.formatOnClosingCurlyWorker = formatOnClosingCurlyWorker;
function formatDocument(sourceFile, rulesProvider, options) {
return formatDocumentWorker(sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatDocument = formatDocument;
function formatDocumentWorker(sourceFile, rulesProvider, options) {
var span = {
pos: 0,
end: sourceFile.text.length
};
return formatSpan(span, sourceFile, options, rulesProvider, 0);
}
formatting.formatDocument = formatDocument;
formatting.formatDocumentWorker = formatDocumentWorker;
function formatSelection(start, end, sourceFile, rulesProvider, options) {
return formatSelectionWorker(start, end, sourceFile, rulesProvider, ts.toEditorSettings(options));
}
formatting.formatSelection = formatSelection;
function formatSelectionWorker(start, end, sourceFile, rulesProvider, options) {
var span = {
pos: ts.getLineStartPositionForPosition(start, sourceFile),
end: end
};
return formatSpan(span, sourceFile, options, rulesProvider, 1);
}
formatting.formatSelection = formatSelection;
formatting.formatSelectionWorker = formatSelectionWorker;
function formatOutermostParent(position, expectedLastToken, sourceFile, options, rulesProvider, requestKind) {
var parent = findOutermostParent(position, expectedLastToken, sourceFile);
if (!parent) {
Expand Down Expand Up @@ -46888,7 +46911,7 @@ var ts;
if (!ruleProvider) {
ruleProvider = new ts.formatting.RulesProvider();
}
ruleProvider.ensureUpToDate(options);
ruleProvider.ensureUpToDateWorker(options);
return ruleProvider;
}
function synchronizeHostData() {
Expand Down Expand Up @@ -50857,24 +50880,24 @@ var ts;
function getFormattingEditsForRange(fileName, start, end, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
return ts.formatting.formatSelection(start, end, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatSelectionWorker(start, end, sourceFile, getRuleProvider(settings), settings);
}
function getFormattingEditsForDocument(fileName, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
return ts.formatting.formatDocument(sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatDocumentWorker(sourceFile, getRuleProvider(settings), settings);
}
function getFormattingEditsAfterKeystroke(fileName, position, key, optionsOrSettings) {
var settings = toEditorSettings(optionsOrSettings);
var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
if (key === "}") {
return ts.formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnClosingCurlyWorker(position, sourceFile, getRuleProvider(settings), settings);
}
else if (key === ";") {
return ts.formatting.formatOnSemicolon(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnSemicolonWorker(position, sourceFile, getRuleProvider(settings), settings);
}
else if (key === "\n") {
return ts.formatting.formatOnEnter(position, sourceFile, getRuleProvider(settings), settings);
return ts.formatting.formatOnEnterWorker(position, sourceFile, getRuleProvider(settings), settings);
}
return [];
}
Expand Down

0 comments on commit dbf69b7

Please sign in to comment.