refactor: make code cleaner by using only ls and ls host

Author: zardoy

typescript/src/decorateProxy.ts

@@ -32,13 +32,12 @@ export const overrideRequestPreferences = {
 }
 
 export const decorateLanguageService = (
-    info: ts.server.PluginCreateInfo,
+    { languageService, languageServiceHost }: ts.server.PluginCreateInfo,
     existingProxy: ts.LanguageService | undefined,
     config: { config: any },
     { pluginSpecificSyntaxServerConfigCheck = true }: { pluginSpecificSyntaxServerConfigCheck?: boolean } = {},
 ) => {
     const c: GetConfig = key => lodashGet(config.config, key)
-    const { languageService, languageServiceHost } = info
 
     // Set up decorator object
     const proxy = getInitialProxy(languageService, existingProxy)
@@ -54,7 +53,6 @@ export const decorateLanguageService = (
         }
         const specialCommandResult = options?.triggerCharacter
             ? handleSpecialCommand(
-                  info,
                   fileName,
                   position,
                   options.triggerCharacter as TriggerCharacterCommand,
@@ -142,8 +140,8 @@ export const decorateLanguageService = (
 
     decorateCodeActions(proxy, languageService, c)
     decorateCodeFixes(proxy, languageService, c, languageServiceHost)
-    decorateSemanticDiagnostics(proxy, info, c)
-    decorateDefinitions(proxy, info, c)
+    decorateSemanticDiagnostics(proxy, languageService, languageServiceHost, c)
+    decorateDefinitions(proxy, languageService, languageServiceHost, c)
     decorateReferences(proxy, languageService, c)
     decorateDocumentHighlights(proxy, languageService, c)
     decorateWorkspaceSymbolSearch(proxy, languageService, c, languageServiceHost)

typescript/src/definitions.ts

@@ -3,11 +3,11 @@ import { findChildContainingExactPosition } from './utils'
 import { join } from 'path-browserify'
 import { ModuleDeclaration } from 'typescript'
 
-export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
     proxy.getDefinitionAndBoundSpan = (fileName, position) => {
-        const prior = info.languageService.getDefinitionAndBoundSpan(fileName, position)
+        const prior = languageService.getDefinitionAndBoundSpan(fileName, position)
         if (!prior) {
-            const program = info.languageService.getProgram()!
+            const program = languageService.getProgram()!
             const sourceFile = program.getSourceFile(fileName)!
             const node = findChildContainingExactPosition(sourceFile, position)
             if (node && ts.isStringLiteral(node)) {
@@ -18,7 +18,7 @@ export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c:
                 }
                 if (c('enableFileDefinitions') && ['./', '../'].some(str => node.text.startsWith(str))) {
                     const file = join(fileName, '..', node.text)
-                    if (info.languageServiceHost.fileExists?.(file)) {
+                    if (languageServiceHost.fileExists?.(file)) {
                         return {
                             textSpan,
                             definitions: [
@@ -115,7 +115,7 @@ export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c:
             firstDef.fileName.endsWith('.d.ts')
         ) {
             const jsFileName = `${firstDef.fileName.slice(0, -'.d.ts'.length)}.js`
-            const isJsFileExist = info.languageServiceHost.fileExists?.(jsFileName)
+            const isJsFileExist = languageServiceHost.fileExists?.(jsFileName)
             if (isJsFileExist) prior.definitions = [{ ...firstDef, fileName: jsFileName }]
         }
         if (c('miscDefinitionImprovement') && prior.definitions) {
@@ -126,7 +126,7 @@ export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c:
                 // filter out css modules index definition
                 if (containerName === 'classes' && containerKind === undefined && rest['isAmbient'] && kind === 'index' && name === '__index') {
                     // ensure we don't filter out something important?
-                    const nodeAtDefinition = findChildContainingExactPosition(info.languageService.getProgram()!.getSourceFile(fileName)!, textSpan.start)
+                    const nodeAtDefinition = findChildContainingExactPosition(languageService.getProgram()!.getSourceFile(fileName)!, textSpan.start)
                     let moduleDeclaration: ModuleDeclaration | undefined
                     ts.findAncestor(nodeAtDefinition, node => {
                         if (ts.isModuleDeclaration(node)) {

typescript/src/semanticDiagnostics.ts

@@ -1,11 +1,10 @@
-import type tslib from 'typescript/lib/tsserverlibrary'
 import { GetConfig } from './types'
 
-export default (proxy: ts.LanguageService, info: ts.server.PluginCreateInfo, c: GetConfig) => {
+export default (proxy: ts.LanguageService, languageService: ts.LanguageService, languageServiceHost: ts.LanguageServiceHost, c: GetConfig) => {
     proxy.getSemanticDiagnostics = fileName => {
-        let prior = info.languageService.getSemanticDiagnostics(fileName)
+        let prior = languageService.getSemanticDiagnostics(fileName)
         if (c('supportTsDiagnosticDisableComment')) {
-            const scriptSnapshot = info.languageServiceHost.getScriptSnapshot(fileName)!
+            const scriptSnapshot = languageServiceHost.getScriptSnapshot(fileName)!
             const firstLine = scriptSnapshot.getText(0, scriptSnapshot.getLength()).split(/\r?\n/)[0]!
             if (firstLine.startsWith('//')) {
                 const match = firstLine.match(/@ts-diagnostic-disable ((\d+, )*(\d+))/)

typescript/src/specialCommands/handle.ts

@@ -6,7 +6,6 @@ import getEmmetCompletions from './emmet'
 import objectIntoArrayConverters from './objectIntoArrayConverters'
 
 export default (
-    info: ts.server.PluginCreateInfo,
     fileName: string,
     position: number,
     specialCommand: TriggerCharacterCommand,
@@ -24,13 +23,13 @@ export default (
     if (triggerCharacterCommands.includes(specialCommand) && !configuration) {
         throw new Error('no-ts-essential-plugin-configuration')
     }
-    const sourceFile = info.languageService.getProgram()!.getSourceFile(fileName)!
+    const sourceFile = languageService.getProgram()!.getSourceFile(fileName)!
     if (specialCommand === 'emmet-completions') {
         const leftNode = findChildContainingPosition(ts, sourceFile, position - 1)
         if (!leftNode) return
         return {
             entries: [],
-            typescriptEssentialsResponse: getEmmetCompletions(fileName, leftNode, sourceFile, position, info.languageService),
+            typescriptEssentialsResponse: getEmmetCompletions(fileName, leftNode, sourceFile, position, languageService),
         }
     }
     if (specialCommand === 'turnArrayIntoObject') {

typescript/src/utils.ts

@@ -229,9 +229,9 @@ export function approveCast<T2 extends Array<(node: ts.Node) => node is ts.Node>
 }
 
 export const patchMethod = <T, K extends keyof T>(obj: T, method: K, overriden: (oldMethod: T[K]) => T[K]) => {
-    const oldValue = obj[method]
+    const oldValue = obj[method] as (...args: any) => any
     Object.defineProperty(obj, method, {
-        value: overriden(oldValue),
+        value: overriden(oldValue.bind(obj) as any),
     })
     return () => {
         Object.defineProperty(obj, method, {