From 532b64cfcab38887fb3ac895925454872219305c Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 12 Feb 2024 18:02:43 +0100 Subject: [PATCH] replaced imports from 'vscode-languageserver' by imports from 'vscode-languageserver-types' in langium's core modules (non-lsp, non-grammar) --- packages/langium/src/default-module.ts | 2 +- packages/langium/src/documentation/jsdoc.ts | 2 +- packages/langium/src/utils/ast-utils.ts | 2 +- packages/langium/src/utils/cst-utils.ts | 2 +- packages/langium/src/validation/document-validator.ts | 3 +-- packages/langium/src/validation/validation-registry.ts | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/langium/src/default-module.ts b/packages/langium/src/default-module.ts index bb6c51b37..a9e8b8217 100644 --- a/packages/langium/src/default-module.ts +++ b/packages/langium/src/default-module.ts @@ -23,6 +23,7 @@ import { DefaultDocumentValidator } from './validation/document-validator.js'; import { ValidationRegistry } from './validation/validation-registry.js'; import { DefaultAstNodeDescriptionProvider, DefaultReferenceDescriptionProvider } from './workspace/ast-descriptions.js'; import { DefaultAstNodeLocator } from './workspace/ast-node-locator.js'; +import { DefaultConfigurationProvider } from './workspace/configuration.js'; import { DefaultDocumentBuilder } from './workspace/document-builder.js'; import { DefaultLangiumDocumentFactory, DefaultLangiumDocuments } from './workspace/documents.js'; import { DefaultIndexManager } from './workspace/index-manager.js'; @@ -33,7 +34,6 @@ import { DefaultCommentProvider } from './documentation/comment-provider.js'; import { LangiumParserErrorMessageProvider } from './parser/langium-parser.js'; import { DefaultAsyncParser } from './parser/async-parser.js'; import { DefaultWorkspaceLock } from './workspace/workspace-lock.js'; -import { DefaultConfigurationProvider } from './index.js'; /** * Context required for creating the default language-specific dependency injection module. diff --git a/packages/langium/src/documentation/jsdoc.ts b/packages/langium/src/documentation/jsdoc.ts index 32ae2202f..29d4d58a1 100644 --- a/packages/langium/src/documentation/jsdoc.ts +++ b/packages/langium/src/documentation/jsdoc.ts @@ -4,8 +4,8 @@ * terms of the MIT License, which is available in the project root. ******************************************************************************/ +import { Position, Range } from 'vscode-languageserver-types'; import type { CstNode } from '../syntax-tree.js'; -import { Position, Range } from 'vscode-languageserver'; import { NEWLINE_REGEXP, escapeRegExp } from '../utils/regexp-utils.js'; import { URI } from '../utils/uri-utils.js'; diff --git a/packages/langium/src/utils/ast-utils.ts b/packages/langium/src/utils/ast-utils.ts index cb915be82..92030e945 100644 --- a/packages/langium/src/utils/ast-utils.ts +++ b/packages/langium/src/utils/ast-utils.ts @@ -4,7 +4,7 @@ * terms of the MIT License, which is available in the project root. ******************************************************************************/ -import type { Range } from 'vscode-languageserver'; +import type { Range } from 'vscode-languageserver-types'; import type { AstNode, AstReflection, CstNode, GenericAstNode, Mutable, PropertyType, Reference, ReferenceInfo } from '../syntax-tree.js'; import type { Stream, TreeStream } from './stream.js'; import type { LangiumDocument } from '../workspace/documents.js'; diff --git a/packages/langium/src/utils/cst-utils.ts b/packages/langium/src/utils/cst-utils.ts index 59e6b1a5c..21135516c 100644 --- a/packages/langium/src/utils/cst-utils.ts +++ b/packages/langium/src/utils/cst-utils.ts @@ -5,7 +5,7 @@ ******************************************************************************/ import type { IToken } from '@chevrotain/types'; -import type { Range } from 'vscode-languageserver'; +import type { Range } from 'vscode-languageserver-types'; import type { CstNode, CompositeCstNode, LeafCstNode } from '../syntax-tree.js'; import type { DocumentSegment } from '../workspace/documents.js'; import type { Stream, TreeStream } from './stream.js'; diff --git a/packages/langium/src/validation/document-validator.ts b/packages/langium/src/validation/document-validator.ts index 1c73d2bf5..ed019e71f 100644 --- a/packages/langium/src/validation/document-validator.ts +++ b/packages/langium/src/validation/document-validator.ts @@ -5,14 +5,13 @@ ******************************************************************************/ import type { MismatchedTokenException } from 'chevrotain'; -import type { Diagnostic } from 'vscode-languageserver'; +import { DiagnosticSeverity, Position, Range, type Diagnostic } from 'vscode-languageserver-types'; import type { LanguageMetaData } from '../languages/language-meta-data.js'; import type { ParseResult } from '../parser/langium-parser.js'; import type { LangiumCoreServices } from '../services.js'; import type { AstNode, CstNode } from '../syntax-tree.js'; import type { LangiumDocument } from '../workspace/documents.js'; import type { DiagnosticData, DiagnosticInfo, ValidationAcceptor, ValidationCategory, ValidationRegistry } from './validation-registry.js'; -import { DiagnosticSeverity, Position, Range } from 'vscode-languageserver'; import { CancellationToken } from '../utils/cancellation.js'; import { findNodeForKeyword, findNodeForProperty } from '../utils/grammar-utils.js'; import { streamAst } from '../utils/ast-utils.js'; diff --git a/packages/langium/src/validation/validation-registry.ts b/packages/langium/src/validation/validation-registry.ts index f77552b82..e6ae570fa 100644 --- a/packages/langium/src/validation/validation-registry.ts +++ b/packages/langium/src/validation/validation-registry.ts @@ -4,7 +4,7 @@ * terms of the MIT License, which is available in the project root. ******************************************************************************/ -import type { CodeDescription, DiagnosticRelatedInformation, DiagnosticTag, integer, Range } from 'vscode-languageserver'; +import type { CodeDescription, DiagnosticRelatedInformation, DiagnosticTag, integer, Range } from 'vscode-languageserver-types'; import type { CancellationToken } from '../utils/cancellation.js'; import type { LangiumCoreServices } from '../services.js'; import type { AstNode, AstReflection, Properties } from '../syntax-tree.js';