From 69d56ee1c5621e8eacdd0d868d1c4162ded11a3f Mon Sep 17 00:00:00 2001 From: Keen Yee Liau Date: Mon, 14 Jan 2019 17:13:06 -0800 Subject: [PATCH] refactor(language-service): Cleanup ts_plugin This commit removes the unnecessary typescriptOnly() helper from ts_plugin and all unused methods related to that. --- packages/language-service/src/ts_plugin.ts | 210 +++++---------------- 1 file changed, 45 insertions(+), 165 deletions(-) diff --git a/packages/language-service/src/ts_plugin.ts b/packages/language-service/src/ts_plugin.ts index d3300c39e1ed7..4bd0f83c60bb1 100644 --- a/packages/language-service/src/ts_plugin.ts +++ b/packages/language-service/src/ts_plugin.ts @@ -9,7 +9,7 @@ import * as ts from 'typescript'; import {createLanguageService} from './language_service'; -import {Completion, Diagnostic, DiagnosticMessageChain, LanguageService, LanguageServiceHost} from './types'; +import {Completion, Diagnostic, DiagnosticMessageChain} from './types'; import {TypeScriptServiceHost} from './typescript_host'; const projectHostMap = new WeakMap(); @@ -21,183 +21,63 @@ export function getExternalFiles(project: any): string[]|undefined { } } -export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageService { - // Create the proxy - const proxy: ts.LanguageService = Object.create(null); - let oldLS: ts.LanguageService = info.languageService; - - function tryCall(fileName: string | undefined, callback: () => T): T|undefined { - if (fileName && !oldLS.getProgram() !.getSourceFile(fileName)) { - return undefined; - } - try { - return callback(); - } catch { - return undefined; - } - } - - function tryFilenameCall(m: (fileName: string) => T): (fileName: string) => T | undefined { - return fileName => tryCall(fileName, () => (m.call(ls, fileName))); - } - - function tryFilenameOneCall(m: (fileName: string, p: P) => T): (filename: string, p: P) => - T | undefined { - return (fileName, p) => tryCall(fileName, () => (m.call(ls, fileName, p))); - } - - function tryFilenameTwoCall(m: (fileName: string, p1: P1, p2: P2) => T): ( - filename: string, p1: P1, p2: P2) => T | undefined { - return (fileName, p1, p2) => tryCall(fileName, () => (m.call(ls, fileName, p1, p2))); - } - - function tryFilenameThreeCall(m: (fileName: string, p1: P1, p2: P2, p3: P3) => T): - (filename: string, p1: P1, p2: P2, p3: P3) => T | undefined { - return (fileName, p1, p2, p3) => tryCall(fileName, () => (m.call(ls, fileName, p1, p2, p3))); - } - - function tryFilenameFourCall( - m: (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4) => - T): (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4) => T | undefined { - return (fileName, p1, p2, p3, p4) => - tryCall(fileName, () => (m.call(ls, fileName, p1, p2, p3, p4))); - } - - function tryFilenameFiveCall( - m: (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) => - T): (fileName: string, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) => T | undefined { - return (fileName, p1, p2, p3, p4, p5) => - tryCall(fileName, () => (m.call(ls, fileName, p1, p2, p3, p4, p5))); - } - - function typescriptOnly(ls: ts.LanguageService): ts.LanguageService { - const languageService: ts.LanguageService = { - cleanupSemanticCache: () => ls.cleanupSemanticCache(), - getSyntacticDiagnostics: tryFilenameCall(ls.getSyntacticDiagnostics), - getSemanticDiagnostics: tryFilenameCall(ls.getSemanticDiagnostics), - getCompilerOptionsDiagnostics: () => ls.getCompilerOptionsDiagnostics(), - getSyntacticClassifications: tryFilenameOneCall(ls.getSemanticClassifications), - getSemanticClassifications: tryFilenameOneCall(ls.getSemanticClassifications), - getEncodedSyntacticClassifications: tryFilenameOneCall(ls.getEncodedSyntacticClassifications), - getEncodedSemanticClassifications: tryFilenameOneCall(ls.getEncodedSemanticClassifications), - getCompletionsAtPosition: tryFilenameTwoCall(ls.getCompletionsAtPosition), - getCompletionEntryDetails: tryFilenameFiveCall(ls.getCompletionEntryDetails), - getCompletionEntrySymbol: tryFilenameThreeCall(ls.getCompletionEntrySymbol), - getJsxClosingTagAtPosition: tryFilenameOneCall(ls.getJsxClosingTagAtPosition), - getQuickInfoAtPosition: tryFilenameOneCall(ls.getQuickInfoAtPosition), - getNameOrDottedNameSpan: tryFilenameTwoCall(ls.getNameOrDottedNameSpan), - getBreakpointStatementAtPosition: tryFilenameOneCall(ls.getBreakpointStatementAtPosition), - getSignatureHelpItems: tryFilenameTwoCall(ls.getSignatureHelpItems), - getRenameInfo: tryFilenameOneCall(ls.getRenameInfo), - findRenameLocations: tryFilenameThreeCall(ls.findRenameLocations), - getDefinitionAtPosition: tryFilenameOneCall(ls.getDefinitionAtPosition), - getTypeDefinitionAtPosition: tryFilenameOneCall(ls.getTypeDefinitionAtPosition), - getImplementationAtPosition: tryFilenameOneCall(ls.getImplementationAtPosition), - getReferencesAtPosition: tryFilenameOneCall(ls.getReferencesAtPosition), - findReferences: tryFilenameOneCall(ls.findReferences), - getDocumentHighlights: tryFilenameTwoCall(ls.getDocumentHighlights), - /** @deprecated */ - getOccurrencesAtPosition: tryFilenameOneCall(ls.getOccurrencesAtPosition), - getNavigateToItems: - (searchValue, maxResultCount, fileName, excludeDtsFiles) => tryCall( - fileName, - () => ls.getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles)), - getNavigationBarItems: tryFilenameCall(ls.getNavigationBarItems), - getNavigationTree: tryFilenameCall(ls.getNavigationTree), - getOutliningSpans: tryFilenameCall(ls.getOutliningSpans), - getTodoComments: tryFilenameOneCall(ls.getTodoComments), - getBraceMatchingAtPosition: tryFilenameOneCall(ls.getBraceMatchingAtPosition), - getIndentationAtPosition: tryFilenameTwoCall(ls.getIndentationAtPosition), - getFormattingEditsForRange: tryFilenameThreeCall(ls.getFormattingEditsForRange), - getFormattingEditsForDocument: tryFilenameOneCall(ls.getFormattingEditsForDocument), - getFormattingEditsAfterKeystroke: tryFilenameThreeCall(ls.getFormattingEditsAfterKeystroke), - getDocCommentTemplateAtPosition: tryFilenameOneCall(ls.getDocCommentTemplateAtPosition), - isValidBraceCompletionAtPosition: tryFilenameTwoCall(ls.isValidBraceCompletionAtPosition), - getSpanOfEnclosingComment: tryFilenameTwoCall(ls.getSpanOfEnclosingComment), - getCodeFixesAtPosition: tryFilenameFiveCall(ls.getCodeFixesAtPosition), - applyCodeActionCommand: - ((action: any) => tryCall(undefined, () => ls.applyCodeActionCommand(action))), - getEmitOutput: tryFilenameCall(ls.getEmitOutput), - getProgram: () => ls.getProgram(), - dispose: () => ls.dispose(), - getApplicableRefactors: tryFilenameTwoCall(ls.getApplicableRefactors), - getEditsForRefactor: tryFilenameFiveCall(ls.getEditsForRefactor), - getDefinitionAndBoundSpan: tryFilenameOneCall(ls.getDefinitionAndBoundSpan), - getCombinedCodeFix: - (scope: ts.CombinedCodeFixScope, fixId: {}, formatOptions: ts.FormatCodeSettings, - preferences: ts.UserPreferences) => - tryCall( - undefined, () => ls.getCombinedCodeFix(scope, fixId, formatOptions, preferences)), - // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one - getSuggestionDiagnostics: (fileName: string) => [], - // TODO(kyliau): dummy implementation to compile with ts 2.8, create real one - organizeImports: (scope: ts.CombinedCodeFixScope, formatOptions: ts.FormatCodeSettings) => [], - // TODO: dummy implementation to compile with ts 2.9, create a real one - getEditsForFileRename: - (oldFilePath: string, newFilePath: string, formatOptions: ts.FormatCodeSettings, - preferences: ts.UserPreferences | undefined) => [] - } as ts.LanguageService; - return languageService; - } - - oldLS = typescriptOnly(oldLS); +function completionToEntry(c: Completion): ts.CompletionEntry { + return { + // TODO: remove any and fix type error. + kind: c.kind as any, + name: c.name, + sortText: c.sort, + kindModifiers: '' + }; +} - for (const k in oldLS) { - (proxy)[k] = function() { return (oldLS as any)[k].apply(oldLS, arguments); }; - } +function diagnosticChainToDiagnosticChain(chain: DiagnosticMessageChain): + ts.DiagnosticMessageChain { + return { + messageText: chain.message, + category: ts.DiagnosticCategory.Error, + code: 0, + next: chain.next ? diagnosticChainToDiagnosticChain(chain.next) : undefined + }; +} - function completionToEntry(c: Completion): ts.CompletionEntry { - return { - // TODO: remove any and fix type error. - kind: c.kind as any, - name: c.name, - sortText: c.sort, - kindModifiers: '' - }; - } - - function diagnosticChainToDiagnosticChain(chain: DiagnosticMessageChain): - ts.DiagnosticMessageChain { - return { - messageText: chain.message, - category: ts.DiagnosticCategory.Error, - code: 0, - next: chain.next ? diagnosticChainToDiagnosticChain(chain.next) : undefined - }; +function diagnosticMessageToDiagnosticMessageText(message: string | DiagnosticMessageChain): string| + ts.DiagnosticMessageChain { + if (typeof message === 'string') { + return message; } + return diagnosticChainToDiagnosticChain(message); +} - function diagnosticMessageToDiagnosticMessageText(message: string | DiagnosticMessageChain): - string|ts.DiagnosticMessageChain { - if (typeof message === 'string') { - return message; - } - return diagnosticChainToDiagnosticChain(message); - } +function diagnosticToDiagnostic(d: Diagnostic, file: ts.SourceFile): ts.Diagnostic { + const result = { + file, + start: d.span.start, + length: d.span.end - d.span.start, + messageText: diagnosticMessageToDiagnosticMessageText(d.message), + category: ts.DiagnosticCategory.Error, + code: 0, + source: 'ng' + }; + return result; +} - function diagnosticToDiagnostic(d: Diagnostic, file: ts.SourceFile): ts.Diagnostic { - const result = { - file, - start: d.span.start, - length: d.span.end - d.span.start, - messageText: diagnosticMessageToDiagnosticMessageText(d.message), - category: ts.DiagnosticCategory.Error, - code: 0, - source: 'ng' - }; - return result; - } +export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageService { + const oldLS: ts.LanguageService = info.languageService; + const proxy: ts.LanguageService = Object.assign({}, oldLS); + const logger = info.project.projectService.logger; function tryOperation(attempting: string, callback: () => T): T|null { try { return callback(); } catch (e) { - info.project.projectService.logger.info(`Failed to ${attempting}: ${e.toString()}`); - info.project.projectService.logger.info(`Stack trace: ${e.stack}`); + logger.info(`Failed to ${attempting}: ${e.toString()}`); + logger.info(`Stack trace: ${e.stack}`); return null; } } - const serviceHost = new TypeScriptServiceHost(info.languageServiceHost, info.languageService); + const serviceHost = new TypeScriptServiceHost(info.languageServiceHost, oldLS); const ls = createLanguageService(serviceHost as any); serviceHost.setSite(ls); projectHostMap.set(info.project, serviceHost); @@ -261,7 +141,7 @@ export function create(info: any /* ts.server.PluginCreateInfo */): ts.LanguageS let result = oldLS.getSemanticDiagnostics(fileName); const base = result || []; tryOperation('get diagnostics', () => { - info.project.projectService.logger.info(`Computing Angular semantic diagnostics...`); + logger.info(`Computing Angular semantic diagnostics...`); const ours = ls.getDiagnostics(fileName); if (ours && ours.length) { const file = oldLS.getProgram() !.getSourceFile(fileName);