refactor: no longer emit js files to out directory

volarjs · Dec 15, 2023 · 431a2bc · 431a2bc
1 parent 345bab2
commit 431a2bc
Show file tree

Hide file tree

Showing 93 changed files with 75 additions and 155 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 out
 node_modules
 *.tsbuildinfo
+*.d.ts
+*.js
+*.map
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,6 @@
  "editor.insertSpaces": false,
  "editor.detectIndentation": false,
  "files.insertFinalNewline": true,
- "files.trimFinalNewlines": true,
  "json.format.keepLines": true,
  "typescript.tsdk": "node_modules/typescript/lib",
  "[typescript]": {
@@ -17,5 +16,13 @@
  },
  "[jsonc]": {
  "editor.defaultFormatter": "vscode.json-language-features"
+ },
+ "files.exclude": {
+ "packages/*/*.d.ts": true,
+ "packages/*/*.js": true,
+ "packages/*/*.map": true,
+ "packages/*/lib/**/*.d.ts": true,
+ "packages/*/lib/**/*.js": true,
+ "packages/*/lib/**/*.map": true
  }
 }
diff --git a/packages/css/src/index.ts → packages/css/index.ts b/packages/css/src/index.ts → packages/css/index.ts
diff --git a/packages/css/tsconfig.json b/packages/css/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/emmet/src/empty.ts → packages/emmet/empty.ts b/packages/emmet/src/empty.ts → packages/emmet/empty.ts
diff --git a/packages/emmet/src/index.ts → packages/emmet/index.ts b/packages/emmet/src/index.ts → packages/emmet/index.ts
diff --git a/packages/emmet/package.json b/packages/emmet/package.json
@@ -37,6 +37,6 @@
  }
  },
  "browser": {
- "./out/index.js": "./out/empty.js"
+ "./index.js": "./empty.js"
  }
 }
diff --git a/packages/emmet/tsconfig.json b/packages/emmet/tsconfig.json
@@ -1,10 +1,6 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
  "references": [
  { "path": "../html/tsconfig.json" },
  ],

diff --git a/packages/eslint/src/index.ts → packages/eslint/index.ts b/packages/eslint/src/index.ts → packages/eslint/index.ts
diff --git a/packages/eslint/tsconfig.json b/packages/eslint/tsconfig.json
@@ -1,10 +1,6 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
  "references": [
  { "path": "../typescript/tsconfig.json" },
  ],

diff --git a/packages/html/src/index.ts → packages/html/index.ts b/packages/html/src/index.ts → packages/html/index.ts
diff --git a/packages/html/tsconfig.json b/packages/html/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/json/src/index.ts → packages/json/index.ts b/packages/json/src/index.ts → packages/json/index.ts
diff --git a/packages/json/tsconfig.json b/packages/json/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/markdown/src/index.ts → packages/markdown/index.ts b/packages/markdown/src/index.ts → packages/markdown/index.ts
diff --git a/packages/markdown/tsconfig.json b/packages/markdown/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/prettier/src/index.ts → packages/prettier/index.ts b/packages/prettier/src/index.ts → packages/prettier/index.ts
diff --git a/packages/prettier/tsconfig.json b/packages/prettier/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/pretty-ts-errors/src/index.ts → packages/pretty-ts-errors/index.ts b/packages/pretty-ts-errors/src/index.ts → packages/pretty-ts-errors/index.ts
diff --git a/packages/pretty-ts-errors/tsconfig.json b/packages/pretty-ts-errors/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/prettyhtml/src/index.ts → packages/prettyhtml/index.ts b/packages/prettyhtml/src/index.ts → packages/prettyhtml/index.ts
diff --git a/packages/prettyhtml/tsconfig.json b/packages/prettyhtml/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/pug-beautify/src/index.ts → packages/pug-beautify/index.ts b/packages/pug-beautify/src/index.ts → packages/pug-beautify/index.ts
diff --git a/packages/pug-beautify/tsconfig.json b/packages/pug-beautify/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/pug/src/empty.ts → packages/pug/empty.ts b/packages/pug/src/empty.ts → packages/pug/empty.ts
diff --git a/packages/pug/src/index.ts → packages/pug/index.ts b/packages/pug/src/index.ts → packages/pug/index.ts
@@ -2,7 +2,7 @@ import { transformDocumentSymbol, type Diagnostic, type DiagnosticSeverity, type
 import { create as createHtmlService } from 'volar-service-html';
 import type * as html from 'vscode-html-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import * as pug from './languageService';
+import * as pug from './lib/languageService';
 
 export interface Provide {
  'pug/pugDocument': (document: TextDocument) => pug.PugDocument | undefined;

diff --git a/packages/pug/src/baseParse.ts → packages/pug/lib/baseParse.ts b/packages/pug/src/baseParse.ts → packages/pug/lib/baseParse.ts
diff --git a/packages/pug/src/languageService.ts → packages/pug/lib/languageService.ts b/packages/pug/src/languageService.ts → packages/pug/lib/languageService.ts
diff --git a/packages/pug/src/pugDocument.ts → packages/pug/lib/pugDocument.ts b/packages/pug/src/pugDocument.ts → packages/pug/lib/pugDocument.ts
diff --git a/packages/pug/src/services/completion.ts → packages/pug/lib/services/completion.ts b/packages/pug/src/services/completion.ts → packages/pug/lib/services/completion.ts
diff --git a/...ges/pug/src/services/documentHighlight.ts → ...ges/pug/lib/services/documentHighlight.ts b/...ges/pug/src/services/documentHighlight.ts → ...ges/pug/lib/services/documentHighlight.ts
diff --git a/packages/pug/src/services/documentLinks.ts → packages/pug/lib/services/documentLinks.ts b/packages/pug/src/services/documentLinks.ts → packages/pug/lib/services/documentLinks.ts
diff --git a/packages/pug/src/services/foldingRanges.ts → packages/pug/lib/services/foldingRanges.ts b/packages/pug/src/services/foldingRanges.ts → packages/pug/lib/services/foldingRanges.ts
diff --git a/packages/pug/src/services/hover.ts → packages/pug/lib/services/hover.ts b/packages/pug/src/services/hover.ts → packages/pug/lib/services/hover.ts
diff --git a/packages/pug/src/services/quoteComplete.ts → packages/pug/lib/services/quoteComplete.ts b/packages/pug/src/services/quoteComplete.ts → packages/pug/lib/services/quoteComplete.ts
diff --git a/packages/pug/src/services/scanner.ts → packages/pug/lib/services/scanner.ts b/packages/pug/src/services/scanner.ts → packages/pug/lib/services/scanner.ts
diff --git a/packages/pug/src/services/selectionRanges.ts → packages/pug/lib/services/selectionRanges.ts b/packages/pug/src/services/selectionRanges.ts → packages/pug/lib/services/selectionRanges.ts
diff --git a/packages/pug/package.json b/packages/pug/package.json
@@ -36,6 +36,6 @@
  "@types/node": "latest"
  },
  "browser": {
- "./out/index.js": "./out/empty.js"
+ "./index.js": "./empty.js"
  }
 }
diff --git a/packages/pug/tsconfig.json b/packages/pug/tsconfig.json
@@ -1,10 +1,6 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
  "references": [
  { "path": "../html/tsconfig.json" },
  ],

diff --git a/packages/sass-formatter/src/index.ts → packages/sass-formatter/index.ts b/packages/sass-formatter/src/index.ts → packages/sass-formatter/index.ts
diff --git a/packages/sass-formatter/tsconfig.json b/packages/sass-formatter/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/tsconfig/src/index.ts → packages/tsconfig/index.ts b/packages/tsconfig/src/index.ts → packages/tsconfig/index.ts
diff --git a/packages/tsconfig/tsconfig.json b/packages/tsconfig/tsconfig.json
@@ -1,8 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
 }
diff --git a/packages/tslint/src/index.ts → packages/tslint/index.ts b/packages/tslint/src/index.ts → packages/tslint/index.ts
diff --git a/packages/tslint/tsconfig.json b/packages/tslint/tsconfig.json
@@ -1,10 +1,6 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
  "references": [
  { "path": "../typescript/tsconfig.json" },
  ],

diff --git a/.../typescript-twoslash-queries/src/index.ts → ...ages/typescript-twoslash-queries/index.ts b/.../typescript-twoslash-queries/src/index.ts → ...ages/typescript-twoslash-queries/index.ts
diff --git a/packages/typescript-twoslash-queries/tsconfig.json b/packages/typescript-twoslash-queries/tsconfig.json
@@ -1,10 +1,6 @@
 {
  "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "out",
- "rootDir": "src",
- },
- "include": [ "src" ],
+ "include": [ "*", "lib/**/*" ],
  "references": [
  { "path": "../typescript/tsconfig.json" },
  ],

diff --git a/packages/typescript/src/index.ts → packages/typescript/index.ts b/packages/typescript/src/index.ts → packages/typescript/index.ts
@@ -2,37 +2,37 @@ import type { CancellationToken, CompletionList, CompletionTriggerKind, FileChan
 import * as semver from 'semver';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { getConfigTitle, isJsonDocument, isTsDocument } from './shared';
+import { getConfigTitle, isJsonDocument, isTsDocument } from './lib/shared';
 
 import { getDocumentRegistry } from '@volar/typescript';
 import * as tsFaster from 'typescript-auto-import-cache';
-import * as _callHierarchy from './features/callHierarchy';
-import * as codeActions from './features/codeAction';
-import * as codeActionResolve from './features/codeActionResolve';
-import * as completions from './features/completions/basic';
-import * as directiveCommentCompletions from './features/completions/directiveComment';
-import * as jsDocCompletions from './features/completions/jsDoc';
-import * as completionResolve from './features/completions/resolve';
-import * as definitions from './features/definition';
-import * as diagnostics from './features/diagnostics';
-import * as documentHighlight from './features/documentHighlight';
-import * as documentSymbol from './features/documentSymbol';
-import * as fileReferences from './features/fileReferences';
-import * as fileRename from './features/fileRename';
-import * as foldingRanges from './features/foldingRanges';
-import * as formatting from './features/formatting';
-import * as hover from './features/hover';
-import * as implementation from './features/implementation';
-import * as inlayHints from './features/inlayHints';
-import * as prepareRename from './features/prepareRename';
-import * as references from './features/references';
-import * as rename from './features/rename';
-import * as selectionRanges from './features/selectionRanges';
-import * as semanticTokens from './features/semanticTokens';
-import * as signatureHelp from './features/signatureHelp';
-import * as typeDefinitions from './features/typeDefinition';
-import * as workspaceSymbols from './features/workspaceSymbol';
-import type { SharedContext } from './types';
+import * as _callHierarchy from './lib/features/callHierarchy';
+import * as codeActions from './lib/features/codeAction';
+import * as codeActionResolve from './lib/features/codeActionResolve';
+import * as completions from './lib/features/completions/basic';
+import * as directiveCommentCompletions from './lib/features/completions/directiveComment';
+import * as jsDocCompletions from './lib/features/completions/jsDoc';
+import * as completionResolve from './lib/features/completions/resolve';
+import * as definitions from './lib/features/definition';
+import * as diagnostics from './lib/features/diagnostics';
+import * as documentHighlight from './lib/features/documentHighlight';
+import * as documentSymbol from './lib/features/documentSymbol';
+import * as fileReferences from './lib/features/fileReferences';
+import * as fileRename from './lib/features/fileRename';
+import * as foldingRanges from './lib/features/foldingRanges';
+import * as formatting from './lib/features/formatting';
+import * as hover from './lib/features/hover';
+import * as implementation from './lib/features/implementation';
+import * as inlayHints from './lib/features/inlayHints';
+import * as prepareRename from './lib/features/prepareRename';
+import * as references from './lib/features/references';
+import * as rename from './lib/features/rename';
+import * as selectionRanges from './lib/features/selectionRanges';
+import * as semanticTokens from './lib/features/semanticTokens';
+import * as signatureHelp from './lib/features/signatureHelp';
+import * as typeDefinitions from './lib/features/typeDefinition';
+import * as workspaceSymbols from './lib/features/workspaceSymbol';
+import type { SharedContext } from './lib/types';
 
 export * from '@volar/typescript';
 

diff --git a/...ript/src/configs/getFormatCodeSettings.ts → ...ript/lib/configs/getFormatCodeSettings.ts b/...ript/src/configs/getFormatCodeSettings.ts → ...ript/lib/configs/getFormatCodeSettings.ts
diff --git a/...escript/src/configs/getUserPreferences.ts → ...escript/lib/configs/getUserPreferences.ts b/...escript/src/configs/getUserPreferences.ts → ...escript/lib/configs/getUserPreferences.ts
diff --git a/.../typescript/src/features/callHierarchy.ts → .../typescript/lib/features/callHierarchy.ts b/.../typescript/src/features/callHierarchy.ts → .../typescript/lib/features/callHierarchy.ts
diff --git a/...ges/typescript/src/features/codeAction.ts → ...ges/typescript/lib/features/codeAction.ts b/...ges/typescript/src/features/codeAction.ts → ...ges/typescript/lib/features/codeAction.ts
diff --git a/...escript/src/features/codeActionResolve.ts → ...escript/lib/features/codeActionResolve.ts b/...escript/src/features/codeActionResolve.ts → ...escript/lib/features/codeActionResolve.ts
diff --git a/...escript/src/features/completions/basic.ts → ...escript/lib/features/completions/basic.ts b/...escript/src/features/completions/basic.ts → ...escript/lib/features/completions/basic.ts
diff --git a/.../features/completions/directiveComment.ts → .../features/completions/directiveComment.ts b/.../features/completions/directiveComment.ts → .../features/completions/directiveComment.ts
diff --git a/...escript/src/features/completions/jsDoc.ts → ...escript/lib/features/completions/jsDoc.ts b/...escript/src/features/completions/jsDoc.ts → ...escript/lib/features/completions/jsDoc.ts
diff --git a/...cript/src/features/completions/resolve.ts → ...cript/lib/features/completions/resolve.ts b/...cript/src/features/completions/resolve.ts → ...cript/lib/features/completions/resolve.ts
diff --git a/...ges/typescript/src/features/definition.ts → ...ges/typescript/lib/features/definition.ts b/...ges/typescript/src/features/definition.ts → ...ges/typescript/lib/features/definition.ts
diff --git a/...es/typescript/src/features/diagnostics.ts → ...es/typescript/lib/features/diagnostics.ts b/...es/typescript/src/features/diagnostics.ts → ...es/typescript/lib/features/diagnostics.ts
diff --git a/...escript/src/features/documentHighlight.ts → ...escript/lib/features/documentHighlight.ts b/...escript/src/features/documentHighlight.ts → ...escript/lib/features/documentHighlight.ts
diff --git a/...typescript/src/features/documentSymbol.ts → ...typescript/lib/features/documentSymbol.ts b/...typescript/src/features/documentSymbol.ts → ...typescript/lib/features/documentSymbol.ts
diff --git a/...typescript/src/features/fileReferences.ts → ...typescript/lib/features/fileReferences.ts b/...typescript/src/features/fileReferences.ts → ...typescript/lib/features/fileReferences.ts
diff --git a/...ges/typescript/src/features/fileRename.ts → ...ges/typescript/lib/features/fileRename.ts b/...ges/typescript/src/features/fileRename.ts → ...ges/typescript/lib/features/fileRename.ts
diff --git a/.../typescript/src/features/foldingRanges.ts → .../typescript/lib/features/foldingRanges.ts b/.../typescript/src/features/foldingRanges.ts → .../typescript/lib/features/foldingRanges.ts
diff --git a/...ges/typescript/src/features/formatting.ts → ...ges/typescript/lib/features/formatting.ts b/...ges/typescript/src/features/formatting.ts → ...ges/typescript/lib/features/formatting.ts
diff --git a/packages/typescript/src/features/hover.ts → packages/typescript/lib/features/hover.ts b/packages/typescript/src/features/hover.ts → packages/typescript/lib/features/hover.ts
diff --git a/...typescript/src/features/implementation.ts → ...typescript/lib/features/implementation.ts b/...typescript/src/features/implementation.ts → ...typescript/lib/features/implementation.ts
diff --git a/...ges/typescript/src/features/inlayHints.ts → ...ges/typescript/lib/features/inlayHints.ts b/...ges/typescript/src/features/inlayHints.ts → ...ges/typescript/lib/features/inlayHints.ts
diff --git a/.../typescript/src/features/prepareRename.ts → .../typescript/lib/features/prepareRename.ts b/.../typescript/src/features/prepareRename.ts → .../typescript/lib/features/prepareRename.ts
diff --git a/...ges/typescript/src/features/references.ts → ...ges/typescript/lib/features/references.ts b/...ges/typescript/src/features/references.ts → ...ges/typescript/lib/features/references.ts
diff --git a/packages/typescript/src/features/rename.ts → packages/typescript/lib/features/rename.ts b/packages/typescript/src/features/rename.ts → packages/typescript/lib/features/rename.ts
diff --git a/...ypescript/src/features/selectionRanges.ts → ...ypescript/lib/features/selectionRanges.ts b/...ypescript/src/features/selectionRanges.ts → ...ypescript/lib/features/selectionRanges.ts
diff --git a/...typescript/src/features/semanticTokens.ts → ...typescript/lib/features/semanticTokens.ts b/...typescript/src/features/semanticTokens.ts → ...typescript/lib/features/semanticTokens.ts
diff --git a/.../typescript/src/features/signatureHelp.ts → .../typescript/lib/features/signatureHelp.ts b/.../typescript/src/features/signatureHelp.ts → .../typescript/lib/features/signatureHelp.ts
diff --git a/...typescript/src/features/typeDefinition.ts → ...typescript/lib/features/typeDefinition.ts b/...typescript/src/features/typeDefinition.ts → ...typescript/lib/features/typeDefinition.ts
diff --git a/...ypescript/src/features/workspaceSymbol.ts → ...ypescript/lib/features/workspaceSymbol.ts b/...ypescript/src/features/workspaceSymbol.ts → ...ypescript/lib/features/workspaceSymbol.ts
diff --git a/packages/typescript/src/protocol.const.ts → packages/typescript/lib/protocol.const.ts b/packages/typescript/src/protocol.const.ts → packages/typescript/lib/protocol.const.ts
diff --git a/packages/typescript/src/shared.ts → packages/typescript/lib/shared.ts b/packages/typescript/src/shared.ts → packages/typescript/lib/shared.ts
diff --git a/packages/typescript/src/types.ts → packages/typescript/lib/types.ts b/packages/typescript/src/types.ts → packages/typescript/lib/types.ts
diff --git a/packages/typescript/src/utils/errorCodes.ts → packages/typescript/lib/utils/errorCodes.ts b/packages/typescript/src/utils/errorCodes.ts → packages/typescript/lib/utils/errorCodes.ts
diff --git a/packages/typescript/src/utils/fixNames.ts → packages/typescript/lib/utils/fixNames.ts b/packages/typescript/src/utils/fixNames.ts → packages/typescript/lib/utils/fixNames.ts
diff --git a/packages/typescript/src/utils/modifiers.ts → packages/typescript/lib/utils/modifiers.ts b/packages/typescript/src/utils/modifiers.ts → packages/typescript/lib/utils/modifiers.ts
diff --git a/packages/typescript/src/utils/previewer.ts → packages/typescript/lib/utils/previewer.ts b/packages/typescript/src/utils/previewer.ts → packages/typescript/lib/utils/previewer.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import type * as Proto from '../protocol';
 import type { SharedContext } from '../types';
 
 export interface IFilePathToResourceConverter {
@@ -33,7 +32,7 @@ function processInlineTags(text: string): string {
 }
 
 function getTagBodyText(
- tag: Proto.JSDocTagInfo,
+ tag: ts.server.protocol.JSDocTagInfo,
  filePathConverter: IFilePathToResourceConverter,
  ctx: SharedContext,
 ): string | undefined {
@@ -76,7 +75,7 @@ function getTagBodyText(
 }
 
 function getTagDocumentation(
- tag: Proto.JSDocTagInfo,
+ tag: ts.server.protocol.JSDocTagInfo,
  filePathConverter: IFilePathToResourceConverter,
  ctx: SharedContext,
 ): string | undefined {
@@ -107,7 +106,7 @@ function getTagDocumentation(
 }
 
 export function plainWithLinks(
- parts: readonly Proto.SymbolDisplayPart[] | string,
+ parts: readonly ts.server.protocol.SymbolDisplayPart[] | string,
  filePathConverter: IFilePathToResourceConverter,
  ctx: SharedContext,
 ): string {
@@ -118,7 +117,7 @@ export function plainWithLinks(
  * Convert `@link` inline tags to markdown links
  */
 function convertLinkTags(
- parts: readonly Proto.SymbolDisplayPart[] | string | undefined,
+ parts: readonly ts.server.protocol.SymbolDisplayPart[] | string | undefined,
  filePathConverter: IFilePathToResourceConverter,
  ctx: SharedContext,
 ): string {
@@ -132,7 +131,7 @@ function convertLinkTags(
 
  const out: string[] = [];
 
- let currentLink: { name?: string, target?: Proto.FileSpan, text?: string; } | undefined;
+ let currentLink: { name?: string, target?: ts.server.protocol.FileSpan, text?: string; } | undefined;
  for (const part of parts) {
  switch (part.kind) {
  case 'link':
@@ -184,7 +183,7 @@ function convertLinkTags(
  case 'linkName':
  if (currentLink) {
  currentLink.name = part.text;
- currentLink.target = (part as Proto.JSDocLinkDisplayPart).target;
+ currentLink.target = (part as ts.server.protocol.JSDocLinkDisplayPart).target;
  }
  break;
 
@@ -211,7 +210,7 @@ export function tagsMarkdownPreview(
 }
 
 export function markdownDocumentation(
- documentation: Proto.SymbolDisplayPart[] | string | undefined,
+ documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined,
  tags: ts.JSDocTagInfo[] | undefined,
  filePathConverter: IFilePathToResourceConverter,
  ctx: SharedContext,
@@ -221,7 +220,7 @@ export function markdownDocumentation(
 
 export function addMarkdownDocumentation(
  out: string,
- documentation: Proto.SymbolDisplayPart[] | string | undefined,
+ documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined,
  tags: ts.JSDocTagInfo[] | undefined,
  converter: IFilePathToResourceConverter,
  ctx: SharedContext,

diff --git a/...cript/src/utils/snippetForFunctionCall.ts → ...cript/lib/utils/snippetForFunctionCall.ts b/...cript/src/utils/snippetForFunctionCall.ts → ...cript/lib/utils/snippetForFunctionCall.ts
@@ -1,9 +1,9 @@
-import type * as Proto from '../protocol';
+import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as PConst from '../protocol.const';
 
 export function snippetForFunctionCall(
  item: { insertText?: string; label: string; },
- displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
+ displayParts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>
 ): { snippet: string; parameterCount: number; } {
  if (item.insertText && typeof item.insertText !== 'string') {
  return { snippet: item.insertText, parameterCount: 0 };
@@ -24,7 +24,7 @@ export function snippetForFunctionCall(
 
  function appendJoinedPlaceholders(
  snippet: string,
- parts: ReadonlyArray<Proto.SymbolDisplayPart>,
+ parts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>,
  joiner: string
  ) {
  for (let i = 0; i < parts.length; ++i) {
@@ -39,14 +39,14 @@ export function snippetForFunctionCall(
 }
 
 interface ParamterListParts {
- readonly parts: ReadonlyArray<Proto.SymbolDisplayPart>;
+ readonly parts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>;
  readonly hasOptionalParameters: boolean;
 }
 
 function getParameterListParts(
- displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
+ displayParts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>
 ): ParamterListParts {
- const parts: Proto.SymbolDisplayPart[] = [];
+ const parts: ts.server.protocol.SymbolDisplayPart[] = [];
  let isInMethod = false;
  let hasOptionalParameters = false;
  let parenCount = 0;

diff --git a/packages/typescript/src/utils/transforms.ts → packages/typescript/lib/utils/transforms.ts b/packages/typescript/src/utils/transforms.ts → packages/typescript/lib/utils/transforms.ts
diff --git a/...es/typescript/src/utils/typeConverters.ts → ...es/typescript/lib/utils/typeConverters.ts b/...es/typescript/src/utils/typeConverters.ts → ...es/typescript/lib/utils/typeConverters.ts