|
@@ -64,8 +64,8 @@ export class TypeScriptWorker
|
|
return '';
|
|
return '';
|
|
}
|
|
}
|
|
|
|
|
|
- getScriptText(fileName: string): Promise<string | undefined> {
|
|
|
|
- return Promise.resolve(this._getScriptText(fileName));
|
|
|
|
|
|
+ async getScriptText(fileName: string): Promise<string | undefined> {
|
|
|
|
+ return this._getScriptText(fileName);
|
|
}
|
|
}
|
|
|
|
|
|
_getScriptText(fileName: string): string | undefined {
|
|
_getScriptText(fileName: string): string | undefined {
|
|
@@ -157,8 +157,8 @@ export class TypeScriptWorker
|
|
return fileName === this.getDefaultLibFileName(this._compilerOptions);
|
|
return fileName === this.getDefaultLibFileName(this._compilerOptions);
|
|
}
|
|
}
|
|
|
|
|
|
- getLibFiles(): Promise<Record<string, string>> {
|
|
|
|
- return Promise.resolve(libFileMap);
|
|
|
|
|
|
+ async getLibFiles(): Promise<Record<string, string>> {
|
|
|
|
+ return libFileMap;
|
|
}
|
|
}
|
|
|
|
|
|
// --- language features
|
|
// --- language features
|
|
@@ -176,183 +176,166 @@ export class TypeScriptWorker
|
|
return <Diagnostic[]>diagnostics;
|
|
return <Diagnostic[]>diagnostics;
|
|
}
|
|
}
|
|
|
|
|
|
- getSyntacticDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
|
|
|
|
+ async getSyntacticDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
const diagnostics = this._languageService.getSyntacticDiagnostics(fileName);
|
|
const diagnostics = this._languageService.getSyntacticDiagnostics(fileName);
|
|
- return Promise.resolve(TypeScriptWorker.clearFiles(diagnostics));
|
|
|
|
|
|
+ return TypeScriptWorker.clearFiles(diagnostics);
|
|
}
|
|
}
|
|
|
|
|
|
- getSemanticDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
|
|
|
|
+ async getSemanticDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
const diagnostics = this._languageService.getSemanticDiagnostics(fileName);
|
|
const diagnostics = this._languageService.getSemanticDiagnostics(fileName);
|
|
- return Promise.resolve(TypeScriptWorker.clearFiles(diagnostics));
|
|
|
|
|
|
+ return TypeScriptWorker.clearFiles(diagnostics);
|
|
}
|
|
}
|
|
|
|
|
|
- getSuggestionDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
|
|
|
|
+ async getSuggestionDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
const diagnostics = this._languageService.getSuggestionDiagnostics(
|
|
const diagnostics = this._languageService.getSuggestionDiagnostics(
|
|
fileName
|
|
fileName
|
|
);
|
|
);
|
|
- return Promise.resolve(TypeScriptWorker.clearFiles(diagnostics));
|
|
|
|
|
|
+ return TypeScriptWorker.clearFiles(diagnostics);
|
|
}
|
|
}
|
|
|
|
|
|
- getCompilerOptionsDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
|
|
|
|
+ async getCompilerOptionsDiagnostics(fileName: string): Promise<Diagnostic[]> {
|
|
const diagnostics = this._languageService.getCompilerOptionsDiagnostics();
|
|
const diagnostics = this._languageService.getCompilerOptionsDiagnostics();
|
|
- return Promise.resolve(TypeScriptWorker.clearFiles(diagnostics));
|
|
|
|
|
|
+ return TypeScriptWorker.clearFiles(diagnostics);
|
|
}
|
|
}
|
|
|
|
|
|
- getCompletionsAtPosition(
|
|
|
|
|
|
+ async getCompletionsAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ts.CompletionInfo | undefined> {
|
|
): Promise<ts.CompletionInfo | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getCompletionsAtPosition(
|
|
|
|
- fileName,
|
|
|
|
- position,
|
|
|
|
- undefined
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.getCompletionsAtPosition(
|
|
|
|
+ fileName,
|
|
|
|
+ position,
|
|
|
|
+ undefined
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getCompletionEntryDetails(
|
|
|
|
|
|
+ async getCompletionEntryDetails(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number,
|
|
position: number,
|
|
entry: string
|
|
entry: string
|
|
): Promise<ts.CompletionEntryDetails | undefined> {
|
|
): Promise<ts.CompletionEntryDetails | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getCompletionEntryDetails(
|
|
|
|
- fileName,
|
|
|
|
- position,
|
|
|
|
- entry,
|
|
|
|
- undefined,
|
|
|
|
- undefined,
|
|
|
|
- undefined
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.getCompletionEntryDetails(
|
|
|
|
+ fileName,
|
|
|
|
+ position,
|
|
|
|
+ entry,
|
|
|
|
+ undefined,
|
|
|
|
+ undefined,
|
|
|
|
+ undefined
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getSignatureHelpItems(
|
|
|
|
|
|
+ async getSignatureHelpItems(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ts.SignatureHelpItems | undefined> {
|
|
): Promise<ts.SignatureHelpItems | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getSignatureHelpItems(fileName, position, undefined)
|
|
|
|
|
|
+ return this._languageService.getSignatureHelpItems(
|
|
|
|
+ fileName,
|
|
|
|
+ position,
|
|
|
|
+ undefined
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getQuickInfoAtPosition(
|
|
|
|
|
|
+ async getQuickInfoAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ts.QuickInfo | undefined> {
|
|
): Promise<ts.QuickInfo | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getQuickInfoAtPosition(fileName, position)
|
|
|
|
- );
|
|
|
|
|
|
+ return this._languageService.getQuickInfoAtPosition(fileName, position);
|
|
}
|
|
}
|
|
|
|
|
|
- getOccurrencesAtPosition(
|
|
|
|
|
|
+ async getOccurrencesAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ReadonlyArray<ts.ReferenceEntry> | undefined> {
|
|
): Promise<ReadonlyArray<ts.ReferenceEntry> | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getOccurrencesAtPosition(fileName, position)
|
|
|
|
- );
|
|
|
|
|
|
+ return this._languageService.getOccurrencesAtPosition(fileName, position);
|
|
}
|
|
}
|
|
|
|
|
|
- getDefinitionAtPosition(
|
|
|
|
|
|
+ async getDefinitionAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ReadonlyArray<ts.DefinitionInfo> | undefined> {
|
|
): Promise<ReadonlyArray<ts.DefinitionInfo> | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getDefinitionAtPosition(fileName, position)
|
|
|
|
- );
|
|
|
|
|
|
+ return this._languageService.getDefinitionAtPosition(fileName, position);
|
|
}
|
|
}
|
|
|
|
|
|
- getReferencesAtPosition(
|
|
|
|
|
|
+ async getReferencesAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number
|
|
position: number
|
|
): Promise<ts.ReferenceEntry[] | undefined> {
|
|
): Promise<ts.ReferenceEntry[] | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getReferencesAtPosition(fileName, position)
|
|
|
|
- );
|
|
|
|
|
|
+ return this._languageService.getReferencesAtPosition(fileName, position);
|
|
}
|
|
}
|
|
|
|
|
|
- getNavigationBarItems(fileName: string): Promise<ts.NavigationBarItem[]> {
|
|
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getNavigationBarItems(fileName)
|
|
|
|
- );
|
|
|
|
|
|
+ async getNavigationBarItems(
|
|
|
|
+ fileName: string
|
|
|
|
+ ): Promise<ts.NavigationBarItem[]> {
|
|
|
|
+ return this._languageService.getNavigationBarItems(fileName);
|
|
}
|
|
}
|
|
|
|
|
|
- getFormattingEditsForDocument(
|
|
|
|
|
|
+ async getFormattingEditsForDocument(
|
|
fileName: string,
|
|
fileName: string,
|
|
options: ts.FormatCodeOptions
|
|
options: ts.FormatCodeOptions
|
|
): Promise<ts.TextChange[]> {
|
|
): Promise<ts.TextChange[]> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getFormattingEditsForDocument(fileName, options)
|
|
|
|
|
|
+ return this._languageService.getFormattingEditsForDocument(
|
|
|
|
+ fileName,
|
|
|
|
+ options
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getFormattingEditsForRange(
|
|
|
|
|
|
+ async getFormattingEditsForRange(
|
|
fileName: string,
|
|
fileName: string,
|
|
start: number,
|
|
start: number,
|
|
end: number,
|
|
end: number,
|
|
options: ts.FormatCodeOptions
|
|
options: ts.FormatCodeOptions
|
|
): Promise<ts.TextChange[]> {
|
|
): Promise<ts.TextChange[]> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getFormattingEditsForRange(
|
|
|
|
- fileName,
|
|
|
|
- start,
|
|
|
|
- end,
|
|
|
|
- options
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.getFormattingEditsForRange(
|
|
|
|
+ fileName,
|
|
|
|
+ start,
|
|
|
|
+ end,
|
|
|
|
+ options
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getFormattingEditsAfterKeystroke(
|
|
|
|
|
|
+ async getFormattingEditsAfterKeystroke(
|
|
fileName: string,
|
|
fileName: string,
|
|
postion: number,
|
|
postion: number,
|
|
ch: string,
|
|
ch: string,
|
|
options: ts.FormatCodeOptions
|
|
options: ts.FormatCodeOptions
|
|
): Promise<ts.TextChange[]> {
|
|
): Promise<ts.TextChange[]> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getFormattingEditsAfterKeystroke(
|
|
|
|
- fileName,
|
|
|
|
- postion,
|
|
|
|
- ch,
|
|
|
|
- options
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.getFormattingEditsAfterKeystroke(
|
|
|
|
+ fileName,
|
|
|
|
+ postion,
|
|
|
|
+ ch,
|
|
|
|
+ options
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- findRenameLocations(
|
|
|
|
|
|
+ async findRenameLocations(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number,
|
|
position: number,
|
|
findInStrings: boolean,
|
|
findInStrings: boolean,
|
|
findInComments: boolean,
|
|
findInComments: boolean,
|
|
providePrefixAndSuffixTextForRename: boolean
|
|
providePrefixAndSuffixTextForRename: boolean
|
|
): Promise<readonly ts.RenameLocation[] | undefined> {
|
|
): Promise<readonly ts.RenameLocation[] | undefined> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.findRenameLocations(
|
|
|
|
- fileName,
|
|
|
|
- position,
|
|
|
|
- findInStrings,
|
|
|
|
- findInComments,
|
|
|
|
- providePrefixAndSuffixTextForRename
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.findRenameLocations(
|
|
|
|
+ fileName,
|
|
|
|
+ position,
|
|
|
|
+ findInStrings,
|
|
|
|
+ findInComments,
|
|
|
|
+ providePrefixAndSuffixTextForRename
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- getRenameInfo(
|
|
|
|
|
|
+ async getRenameInfo(
|
|
fileName: string,
|
|
fileName: string,
|
|
position: number,
|
|
position: number,
|
|
options: ts.RenameInfoOptions
|
|
options: ts.RenameInfoOptions
|
|
): Promise<ts.RenameInfo> {
|
|
): Promise<ts.RenameInfo> {
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getRenameInfo(fileName, position, options)
|
|
|
|
- );
|
|
|
|
|
|
+ return this._languageService.getRenameInfo(fileName, position, options);
|
|
}
|
|
}
|
|
|
|
|
|
- getEmitOutput(fileName: string): Promise<ts.EmitOutput> {
|
|
|
|
- return Promise.resolve(this._languageService.getEmitOutput(fileName));
|
|
|
|
|
|
+ async getEmitOutput(fileName: string): Promise<ts.EmitOutput> {
|
|
|
|
+ return this._languageService.getEmitOutput(fileName);
|
|
}
|
|
}
|
|
|
|
|
|
- getCodeFixesAtPosition(
|
|
|
|
|
|
+ async getCodeFixesAtPosition(
|
|
fileName: string,
|
|
fileName: string,
|
|
start: number,
|
|
start: number,
|
|
end: number,
|
|
end: number,
|
|
@@ -360,19 +343,17 @@ export class TypeScriptWorker
|
|
formatOptions: ts.FormatCodeOptions
|
|
formatOptions: ts.FormatCodeOptions
|
|
): Promise<ReadonlyArray<ts.CodeFixAction>> {
|
|
): Promise<ReadonlyArray<ts.CodeFixAction>> {
|
|
const preferences = {};
|
|
const preferences = {};
|
|
- return Promise.resolve(
|
|
|
|
- this._languageService.getCodeFixesAtPosition(
|
|
|
|
- fileName,
|
|
|
|
- start,
|
|
|
|
- end,
|
|
|
|
- errorCodes,
|
|
|
|
- formatOptions,
|
|
|
|
- preferences
|
|
|
|
- )
|
|
|
|
|
|
+ return this._languageService.getCodeFixesAtPosition(
|
|
|
|
+ fileName,
|
|
|
|
+ start,
|
|
|
|
+ end,
|
|
|
|
+ errorCodes,
|
|
|
|
+ formatOptions,
|
|
|
|
+ preferences
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|
|
- updateExtraLibs(extraLibs: IExtraLibs) {
|
|
|
|
|
|
+ async updateExtraLibs(extraLibs: IExtraLibs): Promise<void> {
|
|
this._extraLibs = extraLibs;
|
|
this._extraLibs = extraLibs;
|
|
}
|
|
}
|
|
}
|
|
}
|