Skip to content

Commit

Permalink
revert LanguageServiceContext to ServiceContext
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsoncodehk committed May 21, 2024
1 parent b2c7811 commit ea6b66c
Show file tree
Hide file tree
Showing 36 changed files with 80 additions and 80 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { isAutoInsertEnabled } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { languageFeatureWorker } from '../utils/featureWorkers';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, selection: vscode.Position, change: { rangeOffset: number; rangeLength: number; text: string; }, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isCallHierarchyEnabled } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import * as dedupe from '../utils/dedupe';
Expand All @@ -14,7 +14,7 @@ export interface PluginCallHierarchyData {
embeddedDocumentUri: string | undefined;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideCodeActions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { findOverlapCodeRange, notEmpty } from '../utils/common';
import * as dedupe from '../utils/dedupe';
Expand All @@ -16,7 +16,7 @@ export interface ServiceCodeActionData {
serviceIndex: number;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (_uri: string, range: vscode.Range, codeActionContext: vscode.CodeActionContext, token = NoneCancellationToken) => {
const uri = URI.parse(_uri);
Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideCodeLenses.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import { documentFeatureWorker } from '../utils/featureWorkers';
Expand All @@ -20,7 +20,7 @@ export interface ServiceReferencesCodeLensData {
serviceIndex: number;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (uri: string, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import type * as vscode from 'vscode-languageserver-protocol';
import { notEmpty } from '../utils/common';
import { NoneCancellationToken } from '../utils/cancellation';
import { isColorEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, color: vscode.Color, range: vscode.Range, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isCompletionEnabled, type CodeInformation } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext, LanguageServicePluginInstance } from '../types';
import type { ServiceContext, LanguageServicePluginInstance } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { transformCompletionList } from '../utils/transform';
import { forEachEmbeddedDocument } from '../utils/featureWorkers';
Expand All @@ -15,7 +15,7 @@ export interface ServiceCompletionData {
embeddedDocumentUri: string | undefined;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

let lastResult: {
uri: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import type { CodeInformation } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import type { SourceMapWithDocuments } from '../documents';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import * as dedupe from '../utils/dedupe';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { URI } from 'vscode-uri';

export function register(
context: LanguageServiceContext,
context: ServiceContext,
apiName: 'provideDefinition' | 'provideTypeDefinition' | 'provideImplementation',
isValidPosition: (data: CodeInformation) => boolean
) {
Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideDiagnostics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type * as vscode from 'vscode-languageserver-protocol';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import { URI } from 'vscode-uri';
import type { SourceMapWithDocuments } from '../documents';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { sleep } from '../utils/common';
import * as dedupe from '../utils/dedupe';
Expand Down Expand Up @@ -128,7 +128,7 @@ export const errorMarkups: Record<string, {
markup: vscode.MarkupContent,
}[]> = {};

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

const lastResponses = createUriMap<
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { isColorEnabled } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import { documentFeatureWorker } from '../utils/featureWorkers';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext, DataTransferItem } from '../types';
import type { ServiceContext, DataTransferItem } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { NoneCancellationToken } from '../utils/cancellation';
import { transformWorkspaceEdit } from '../utils/transform';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, dataTransfer: Map<string, DataTransferItem>, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import type * as vscode from 'vscode-languageserver-protocol';
import { TextDocument } from 'vscode-languageserver-textdocument';
import { URI } from 'vscode-uri';
import { SourceMapWithDocuments } from '../documents';
import type { EmbeddedCodeFormattingOptions, LanguageServiceContext } from '../types';
import type { EmbeddedCodeFormattingOptions, ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { findOverlapCodeRange, stringToSnapshot } from '../utils/common';
import { getEmbeddedFilesByLevel as getEmbeddedCodesByLevel } from '../utils/featureWorkers';
import { createUriMap } from '../utils/uriMap';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

let fakeVersion = 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import * as dedupe from '../utils/dedupe';
Expand All @@ -8,7 +8,7 @@ import { NoneCancellationToken } from '../utils/cancellation';
import { isHighlightEnabled } from '@volar/language-core';
import { URI } from 'vscode-uri';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import { documentFeatureWorker } from '../utils/featureWorkers';
Expand All @@ -12,7 +12,7 @@ export interface DocumentLinkData {
serviceIndex: number;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (uri: string, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { SemanticToken, LanguageServiceContext } from '../types';
import type { SemanticToken, ServiceContext } from '../types';
import { SemanticTokensBuilder } from '../utils/SemanticTokensBuilder';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty, findOverlapCodeRange } from '../utils/common';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { isSemanticTokensEnabled } from '@volar/language-core';
import { URI } from 'vscode-uri';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (
_uri: string,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { documentFeatureWorker } from '../utils/featureWorkers';
import type * as vscode from 'vscode-languageserver-protocol';
import { isInsideRange, notEmpty } from '../utils/common';
import { NoneCancellationToken } from '../utils/cancellation';
import { transformDocumentSymbol } from '../utils/transform';
import { isSymbolsEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, token = NoneCancellationToken): Promise<vscode.DocumentSymbol[] | undefined> => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { isReferencesEnabled } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import { URI } from 'vscode-uri';
import type { NullableProviderResult, LanguageServiceContext } from '../types';
import type { NullableProviderResult, ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { notEmpty } from '../utils/common';
import * as dedupe from '../utils/dedupe';
import { documentFeatureWorker } from '../utils/featureWorkers';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, token = NoneCancellationToken): NullableProviderResult<vscode.Location[]> => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { transformWorkspaceEdit } from '../utils/transform';
import type * as _ from 'vscode-languageserver-protocol';
import * as dedupe from '../utils/dedupe';
import { NoneCancellationToken } from '../utils/cancellation';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (oldUri: string, newUri: string, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { documentFeatureWorker } from '../utils/featureWorkers';
import { NoneCancellationToken } from '../utils/cancellation';

import type * as _ from 'vscode-languageserver-protocol';
import { transformFoldingRanges } from '../utils/transform';
import { isFoldingRangesEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, token = NoneCancellationToken) => {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideHover.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { isInsideRange } from '../utils/common';
import { errorMarkups } from './provideDiagnostics';
import { NoneCancellationToken } from '../utils/cancellation';
import { transformMarkdown } from '../utils/transform';
import { isHoverEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (uri: string, position: vscode.Position, token = NoneCancellationToken) => {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideInlayHints.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { isInlayHintsEnabled } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import { URI } from 'vscode-uri';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { findOverlapCodeRange, notEmpty } from '../utils/common';
import { languageFeatureWorker } from '../utils/featureWorkers';
Expand All @@ -13,7 +13,7 @@ export interface InlayHintData {
serviceIndex: number;
}

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return async (_uri: string, range: vscode.Range, token = NoneCancellationToken) => {
const uri = URI.parse(_uri);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import type * as vscode from 'vscode-languageserver-protocol';
import { notEmpty } from '../utils/common';
import { NoneCancellationToken } from '../utils/cancellation';
import { isLinkedEditingEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, token = NoneCancellationToken) => {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideReferences.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import * as dedupe from '../utils/dedupe';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import { NoneCancellationToken } from '../utils/cancellation';
import { isReferencesEnabled } from '@volar/language-core';
import { URI } from 'vscode-uri';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, referenceContext: vscode.ReferenceContext, token = NoneCancellationToken) => {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideRenameEdits.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { isRenameEnabled, type CodeInformation, resolveRenameNewName } from '@volar/language-core';
import type * as vscode from 'vscode-languageserver-protocol';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import * as dedupe from '../utils/dedupe';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { pushEditToDocumentChanges, transformWorkspaceEdit } from '../utils/transform';
import { URI } from 'vscode-uri';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, newName: string, token = NoneCancellationToken) => {

Expand Down
4 changes: 2 additions & 2 deletions packages/language-service/lib/features/provideRenameRange.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { NoneCancellationToken } from '../utils/cancellation';
import { isRenameEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, position: vscode.Position, token = NoneCancellationToken) => {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type * as vscode from 'vscode-languageserver-protocol';
import type { LanguageServiceContext } from '../types';
import type { ServiceContext } from '../types';
import { NoneCancellationToken } from '../utils/cancellation';
import { isEqualRange, isInsideRange, notEmpty } from '../utils/common';
import { languageFeatureWorker } from '../utils/featureWorkers';
import { transformSelectionRanges } from '../utils/transform';
import { isSelectionRangesEnabled } from '@volar/language-core';

export function register(context: LanguageServiceContext) {
export function register(context: ServiceContext) {

return (uri: string, positions: vscode.Position[], token = NoneCancellationToken) => {

Expand Down

0 comments on commit ea6b66c

Please sign in to comment.