refactor(typescript): reorganize code

volarjs · Mar 8, 2024 · 6e79999 · 6e79999
1 parent 411857c
commit 6e79999
Show file tree

Hide file tree

Showing 33 changed files with 543 additions and 785 deletions.
diff --git a/packages/typescript/index.ts b/packages/typescript/index.ts
diff --git a/packages/typescript/lib/configs/getFormatCodeSettings.ts b/packages/typescript/lib/configs/getFormatCodeSettings.ts
@@ -1,11 +1,10 @@
-import type { FormattingOptions } from '@volar/language-service';
+import type { FormattingOptions, ServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { getConfigTitle } from '../shared';
-import type { SharedContext } from '../types';
 
 export async function getFormatCodeSettings(
- ctx: SharedContext,
+ ctx: ServiceContext,
  document: TextDocument,
  options?: FormattingOptions,
 ): Promise<ts.FormatCodeSettings> {

diff --git a/packages/typescript/lib/features/callHierarchy.ts b/packages/typescript/lib/features/callHierarchy.ts
diff --git a/packages/typescript/lib/features/codeAction.ts b/packages/typescript/lib/features/codeAction.ts
@@ -7,6 +7,7 @@ import type { SharedContext } from '../types';
 import * as fixNames from '../utils/fixNames';
 import { resolveFixAllCodeAction, resolveOrganizeImportsCodeAction, resolveRefactorCodeAction } from './codeActionResolve';
 import { fileTextChangesToWorkspaceEdit } from './rename';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 export interface FixAllData {
  type: 'fixAll',
@@ -42,11 +43,7 @@ export function register(ctx: SharedContext) {
  resolveEditSupport = true;
  }
 
- return async (uri: string, range: vscode.Range, context: vscode.CodeActionContext) => {
-
- const document = ctx.getTextDocument(uri);
- if (!document) return;
-
+ return async (document: TextDocument, range: vscode.Range, context: vscode.CodeActionContext) => {
  const [formatOptions, preferences] = await Promise.all([
  getFormatCodeSettings(ctx, document),
  getUserPreferences(ctx, document),
@@ -111,7 +108,7 @@ export function register(ctx: SharedContext) {
  };
  const data: OrganizeImportsData = {
  type: 'organizeImports',
- uri,
+ uri: document.uri,
  fileName,
  };
  if (resolveEditSupport) {
@@ -130,7 +127,7 @@ export function register(ctx: SharedContext) {
  kind: onlySourceFixAll,
  };
  const data: FixAllData = {
- uri,
+ uri: document.uri,
  type: 'fixAll',
  fileName,
  fixIds: [
@@ -155,7 +152,7 @@ export function register(ctx: SharedContext) {
  kind: onlyRemoveUnused,
  };
  const data: FixAllData = {
- uri,
+ uri: document.uri,
  type: 'fixAll',
  fileName,
  fixIds: [
@@ -184,7 +181,7 @@ export function register(ctx: SharedContext) {
  kind: onlyAddMissingImports,
  };
  const data: FixAllData = {
- uri,
+ uri: document.uri,
  type: 'fixAll',
  fileName,
  fixIds: [
@@ -250,7 +247,7 @@ export function register(ctx: SharedContext) {
  kind,
  };
  const data: FixAllData = {
- uri,
+ uri: document.uri,
  type: 'fixAll',
  fileName,
  fixIds: [codeFix.fixId],
@@ -280,7 +277,7 @@ export function register(ctx: SharedContext) {
  codeAction.isPreferred = true;
  }
  const data: RefactorData = {
- uri,
+ uri: document.uri,
  type: 'refactor',
  fileName,
  range: { pos: start, end: end },

diff --git a/packages/typescript/lib/features/codeActionResolve.ts b/packages/typescript/lib/features/codeActionResolve.ts
@@ -13,15 +13,15 @@ export function register(ctx: SharedContext) {
 
  const data: Data = codeAction.data;
  const document = ctx.getTextDocument(data.uri);
- const [formatOptions, preferences] = document ? await Promise.all([
+ const [formatOptions, preferences] = await Promise.all([
  getFormatCodeSettings(ctx, document),
  getUserPreferences(ctx, document),
- ]) : [{}, {}];
+ ]);
 
  if (data?.type === 'fixAll') {
  resolveFixAllCodeAction(ctx, codeAction, data, formatOptions, preferences);
  }
- else if (data?.type === 'refactor' && document) {
+ else if (data?.type === 'refactor') {
  resolveRefactorCodeAction(ctx, codeAction, data, document, formatOptions, preferences);
  }
  else if (data?.type === 'organizeImports') {

diff --git a/packages/typescript/lib/features/completions/basic.ts b/packages/typescript/lib/features/completions/basic.ts
@@ -26,12 +26,7 @@ export function register(ctx: SharedContext) {
  const lt_320 = semver.lt(ts.version, '3.2.0');
  const gte_300 = semver.gte(ts.version, '3.0.0');
 
- return async (uri: string, position: vscode.Position, options?: ts.GetCompletionsAtPositionOptions): Promise<vscode.CompletionList | undefined> => {
-
- const document = ctx.getTextDocument(uri);
- if (!document)
- return;
-
+ return async (document: TextDocument, position: vscode.Position, options?: ts.GetCompletionsAtPositionOptions): Promise<vscode.CompletionList | undefined> => {
  const preferences = await getUserPreferences(ctx, document);
  const fileName = ctx.uriToFileName(document.uri);
  const offset = document.offsetAt(position);
@@ -148,7 +143,7 @@ export function register(ctx: SharedContext) {
  return {
  ...item,
  data: {
- uri,
+ uri: document.uri,
  fileName,
  offset,
  originalItem: {

diff --git a/packages/typescript/lib/features/completions/directiveComment.ts b/packages/typescript/lib/features/completions/directiveComment.ts
@@ -1,6 +1,6 @@
 import type * as vscode from '@volar/language-service';
 import * as nls from 'vscode-nls';
-import type { SharedContext } from '../../types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 const localize = nls.loadMessageBundle(); // TODO: not working
 
@@ -33,13 +33,8 @@ const directives: Directive[] = [
  }
 ];
 
-export function register(ctx: SharedContext) {
- return (uri: string, position: vscode.Position) => {
-
- const document = ctx.getTextDocument(uri);
- if (!document)
- return;
-
+export function register() {
+ return (document: TextDocument, position: vscode.Position) => {
  const prefix = document.getText({
  start: { line: position.line, character: 0 },
  end: position,

diff --git a/packages/typescript/lib/features/completions/jsDoc.ts b/packages/typescript/lib/features/completions/jsDoc.ts
@@ -9,12 +9,7 @@ const localize = nls.loadMessageBundle(); // TODO: not working
 const defaultJsDoc = `/**\n * $0\n */`;
 
 export function register(ctx: SharedContext) {
- return (uri: string, position: vscode.Position) => {
-
- const document = ctx.getTextDocument(uri);
- if (!document)
- return;
-
+ return (document: TextDocument, position: vscode.Position) => {
  if (!isPotentiallyValidDocCompletionPosition(document, position))
  return;
 

diff --git a/packages/typescript/lib/features/completions/resolve.ts b/packages/typescript/lib/features/completions/resolve.ts
@@ -5,9 +5,9 @@ import { getFormatCodeSettings } from '../../configs/getFormatCodeSettings';
 import { getUserPreferences } from '../../configs/getUserPreferences';
 import { getConfigTitle } from '../../shared';
 import type { SharedContext } from '../../types';
+import { convertDocumentSpanToLocation } from '../../utils/lspConverters';
 import * as previewer from '../../utils/previewer';
 import { snippetForFunctionCall } from '../../utils/snippetForFunctionCall';
-import { entriesToLocations } from '../../utils/transforms';
 import type { Data } from './basic';
 import { handleKindModifiers } from './basic';
 
@@ -17,22 +17,21 @@ export function register(ctx: SharedContext) {
  return async (item: vscode.CompletionItem, newPosition?: vscode.Position): Promise<vscode.CompletionItem> => {
 
  const data: Data | undefined = item.data;
-
  if (!data)
  return item;
 
  const fileName = data.fileName;
  let offset = data.offset;
  const document = ctx.getTextDocument(data.uri);
 
- if (newPosition && document) {
+ if (newPosition) {
  offset = document.offsetAt(newPosition);
  }
 
- const [formatOptions, preferences] = document ? await Promise.all([
+ const [formatOptions, preferences] = await Promise.all([
  getFormatCodeSettings(ctx, document),
  getUserPreferences(ctx, document),
- ]) : [{}, {}];
+ ]);
 
  let details: ts.CompletionEntryDetails | undefined;
  try {
@@ -65,7 +64,7 @@ export function register(ctx: SharedContext) {
  const entries = changes.textChanges.map(textChange => {
  return { fileName, textSpan: textChange.span };
  });
- const locs = entriesToLocations(entries, ctx);
+ const locs = entries.map(entry => convertDocumentSpanToLocation(entry, ctx));
  locs.forEach((loc, index) => {
  item.additionalTextEdits?.push({ range: loc.range, newText: changes.textChanges[index].newText });
  });
@@ -88,38 +87,35 @@ export function register(ctx: SharedContext) {
  handleKindModifiers(item, details);
  }
 
- if (document) {
-
- const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.<boolean>(getConfigTitle(document) + '.suggest.completeFunctionCalls') ?? false;
- const useCodeSnippet = useCodeSnippetsOnMethodSuggest && (item.kind === 3 satisfies typeof vscode.CompletionItemKind.Function || item.kind === 2 satisfies typeof vscode.CompletionItemKind.Method);
-
- if (useCodeSnippet) {
- const shouldCompleteFunction = isValidFunctionCompletionContext(ctx.languageService, fileName, offset, document);
- if (shouldCompleteFunction) {
- const { snippet, parameterCount } = snippetForFunctionCall(
- {
- insertText: item.insertText ?? item.textEdit?.newText, // insertText is dropped by LSP in some case: https://github.com/microsoft/vscode-languageserver-node/blob/9b742021fb04ad081aa3676a9eecf4fa612084b4/client/src/common/codeConverter.ts#L659-L664
- label: item.label,
- },
- details.displayParts,
- );
- if (item.textEdit) {
- item.textEdit.newText = snippet;
- }
- if (item.insertText) {
- item.insertText = snippet;
- }
- item.insertTextFormat = 2 satisfies typeof vscode.InsertTextFormat.Snippet;
- if (parameterCount > 0) {
- //Fix for https://github.com/microsoft/vscode/issues/104059
- //Don't show parameter hints if "editor.parameterHints.enabled": false
- // if (await getConfiguration('editor.parameterHints.enabled', document.uri)) {
- // item.command = {
- // title: 'triggerParameterHints',
- // command: 'editor.action.triggerParameterHints',
- // };
- // }
- }
+ const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.<boolean>(getConfigTitle(document) + '.suggest.completeFunctionCalls') ?? false;
+ const useCodeSnippet = useCodeSnippetsOnMethodSuggest && (item.kind === 3 satisfies typeof vscode.CompletionItemKind.Function || item.kind === 2 satisfies typeof vscode.CompletionItemKind.Method);
+
+ if (useCodeSnippet) {
+ const shouldCompleteFunction = isValidFunctionCompletionContext(ctx.languageService, fileName, offset, document);
+ if (shouldCompleteFunction) {
+ const { snippet, parameterCount } = snippetForFunctionCall(
+ {
+ insertText: item.insertText ?? item.textEdit?.newText, // insertText is dropped by LSP in some case: https://github.com/microsoft/vscode-languageserver-node/blob/9b742021fb04ad081aa3676a9eecf4fa612084b4/client/src/common/codeConverter.ts#L659-L664
+ label: item.label,
+ },
+ details.displayParts,
+ );
+ if (item.textEdit) {
+ item.textEdit.newText = snippet;
+ }
+ if (item.insertText) {
+ item.insertText = snippet;
+ }
+ item.insertTextFormat = 2 satisfies typeof vscode.InsertTextFormat.Snippet;
+ if (parameterCount > 0) {
+ //Fix for https://github.com/microsoft/vscode/issues/104059
+ //Don't show parameter hints if "editor.parameterHints.enabled": false
+ // if (await getConfiguration('editor.parameterHints.enabled', document.uri)) {
+ // item.command = {
+ // title: 'triggerParameterHints',
+ // command: 'editor.action.triggerParameterHints',
+ // };
+ // }
  }
  }
  }