From 7df57054571c1e5ae460077e9c9d861bf88e308f Mon Sep 17 00:00:00 2001 From: johnsoncodehk Date: Sun, 6 Jun 2021 18:55:28 +0800 Subject: [PATCH] chore: cssLanguageService -> cssLs --- .../vscode-vue-languageservice/src/parsers/cssClasses.ts | 6 +++--- .../src/services/colorPresentation.ts | 6 +++--- .../vscode-vue-languageservice/src/services/completion.ts | 6 +++--- .../src/services/documentColor.ts | 6 +++--- .../src/services/documentHighlight.ts | 6 +++--- .../src/services/documentLinks.ts | 6 +++--- .../src/services/documentSymbol.ts | 6 +++--- .../src/services/foldingRanges.ts | 6 +++--- .../src/services/selectionRanges.ts | 6 +++--- packages/vscode-vue-languageservice/src/sourceFile.ts | 6 +++--- .../vscode-vue-languageservice/src/virtuals/styles.raw.ts | 8 ++++---- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/vscode-vue-languageservice/src/parsers/cssClasses.ts b/packages/vscode-vue-languageservice/src/parsers/cssClasses.ts index a145ec78b..03f7f3ff8 100644 --- a/packages/vscode-vue-languageservice/src/parsers/cssClasses.ts +++ b/packages/vscode-vue-languageservice/src/parsers/cssClasses.ts @@ -39,9 +39,9 @@ export function parse( } function findClassNames(doc: TextDocument, ss: css.Stylesheet) { const result = new Map>(); - const cssLanguageService = sharedLs.getCssLs(doc.languageId); - if (!cssLanguageService) return result; - const symbols = cssLanguageService.findDocumentSymbols(doc, ss); + const cssLs = sharedLs.getCssLs(doc.languageId); + if (!cssLs) return result; + const symbols = cssLs.findDocumentSymbols(doc, ss); const usedNodes = new Set(); for (const s of symbols) { if (s.kind === css.SymbolKind.Class) { diff --git a/packages/vscode-vue-languageservice/src/services/colorPresentation.ts b/packages/vscode-vue-languageservice/src/services/colorPresentation.ts index dfe65fd09..ad0e511b1 100644 --- a/packages/vscode-vue-languageservice/src/services/colorPresentation.ts +++ b/packages/vscode-vue-languageservice/src/services/colorPresentation.ts @@ -19,11 +19,11 @@ export function register({ sourceFiles }: TsApiRegisterOptions) { function getCssResult(sourceFile: SourceFile) { let result: ColorPresentation[] = []; for (const sourceMap of sourceFile.getCssSourceMaps()) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; const cssRanges = sourceMap.getMappedRanges(range.start, range.end); for (const cssRange of cssRanges) { - const _result = cssLanguageService.getColorPresentations(sourceMap.mappedDocument, sourceMap.stylesheet, color, cssRange); + const _result = cssLs.getColorPresentations(sourceMap.mappedDocument, sourceMap.stylesheet, color, cssRange); for (const item of _result) { if (item.textEdit) { if (TextEdit.is(item.textEdit)) { diff --git a/packages/vscode-vue-languageservice/src/services/completion.ts b/packages/vscode-vue-languageservice/src/services/completion.ts index 6df91c376..8a8f5f5c2 100644 --- a/packages/vscode-vue-languageservice/src/services/completion.ts +++ b/packages/vscode-vue-languageservice/src/services/completion.ts @@ -489,12 +489,12 @@ export function register({ sourceFiles, tsLanguageService, documentContext, vueH items: [], }; } - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; const wordPattern = wordPatterns[sourceMap.mappedDocument.languageId] ?? wordPatterns.css; const wordStart = getWordRange(wordPattern, cssRange.end, sourceMap.mappedDocument)?.start; // TODO: use end? const wordRange: Range = wordStart ? { start: wordStart, end: cssRange.end } : cssRange; - const cssResult = await cssLanguageService.doComplete2(sourceMap.mappedDocument, cssRange.start, sourceMap.stylesheet, documentContext); + const cssResult = await cssLs.doComplete2(sourceMap.mappedDocument, cssRange.start, sourceMap.stylesheet, documentContext); if (cssResult.isIncomplete) { result.isIncomplete = true; } diff --git a/packages/vscode-vue-languageservice/src/services/documentColor.ts b/packages/vscode-vue-languageservice/src/services/documentColor.ts index 47f06b3fa..6ee30b0b8 100644 --- a/packages/vscode-vue-languageservice/src/services/documentColor.ts +++ b/packages/vscode-vue-languageservice/src/services/documentColor.ts @@ -15,9 +15,9 @@ export function register({ sourceFiles }: TsApiRegisterOptions) { const result: ColorInformation[] = []; const sourceMaps = sourceFile.getCssSourceMaps(); for (const sourceMap of sourceMaps) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; - let colors = cssLanguageService.findDocumentColors(sourceMap.mappedDocument, sourceMap.stylesheet); + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; + let colors = cssLs.findDocumentColors(sourceMap.mappedDocument, sourceMap.stylesheet); for (const color of colors) { const vueRange = sourceMap.getSourceRange(color.range.start, color.range.end); if (vueRange) { diff --git a/packages/vscode-vue-languageservice/src/services/documentHighlight.ts b/packages/vscode-vue-languageservice/src/services/documentHighlight.ts index 514d0ca98..e5adbccac 100644 --- a/packages/vscode-vue-languageservice/src/services/documentHighlight.ts +++ b/packages/vscode-vue-languageservice/src/services/documentHighlight.ts @@ -62,10 +62,10 @@ export function register({ sourceFiles, tsLanguageService }: TsApiRegisterOption function getCssResult(sourceFile: SourceFile) { const result: DocumentHighlight[] = []; for (const sourceMap of sourceFile.getCssSourceMaps()) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; for (const cssRange of sourceMap.getMappedRanges(position)) { - const highlights = cssLanguageService.findDocumentHighlights(sourceMap.mappedDocument, cssRange.start, sourceMap.stylesheet); + const highlights = cssLs.findDocumentHighlights(sourceMap.mappedDocument, cssRange.start, sourceMap.stylesheet); for (const highlight of highlights) { const vueRange = sourceMap.getSourceRange(highlight.range.start, highlight.range.end); if (vueRange) { diff --git a/packages/vscode-vue-languageservice/src/services/documentLinks.ts b/packages/vscode-vue-languageservice/src/services/documentLinks.ts index b3a860aa8..b5081f74d 100644 --- a/packages/vscode-vue-languageservice/src/services/documentLinks.ts +++ b/packages/vscode-vue-languageservice/src/services/documentLinks.ts @@ -153,9 +153,9 @@ export function register({ documentContext, sourceFiles, vueHost }: TsApiRegiste const sourceMaps = sourceFile.getCssSourceMaps(); const result: DocumentLink[] = []; for (const sourceMap of sourceMaps) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; - const links = await cssLanguageService.findDocumentLinks2(sourceMap.mappedDocument, sourceMap.stylesheet, documentContext); + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; + const links = await cssLs.findDocumentLinks2(sourceMap.mappedDocument, sourceMap.stylesheet, documentContext); for (const link of links) { const vueRange = sourceMap.getSourceRange(link.range.start, link.range.end); if (vueRange) { diff --git a/packages/vscode-vue-languageservice/src/services/documentSymbol.ts b/packages/vscode-vue-languageservice/src/services/documentSymbol.ts index 7d396a2cb..6058bd6fc 100644 --- a/packages/vscode-vue-languageservice/src/services/documentSymbol.ts +++ b/packages/vscode-vue-languageservice/src/services/documentSymbol.ts @@ -132,9 +132,9 @@ export function register({ sourceFiles, tsLanguageService }: TsApiRegisterOption const result: SymbolInformation[] = []; const sourceMaps = sourceFile.getCssSourceMaps(); for (const sourceMap of sourceMaps) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; - let symbols = cssLanguageService.findDocumentSymbols(sourceMap.mappedDocument, sourceMap.stylesheet); + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; + let symbols = cssLs.findDocumentSymbols(sourceMap.mappedDocument, sourceMap.stylesheet); if (!symbols) continue; for (const s of symbols) { const vueRange = sourceMap.getSourceRange(s.location.range.start, s.location.range.end); diff --git a/packages/vscode-vue-languageservice/src/services/foldingRanges.ts b/packages/vscode-vue-languageservice/src/services/foldingRanges.ts index e13b6a98a..06a13efb4 100644 --- a/packages/vscode-vue-languageservice/src/services/foldingRanges.ts +++ b/packages/vscode-vue-languageservice/src/services/foldingRanges.ts @@ -63,9 +63,9 @@ export function register({ ts }: HtmlApiRegisterOptions) { let result: FoldingRange[] = []; for (const sourceMap of sourceFile.getCssSourceMaps()) { if (!sourceMap.capabilities.foldingRanges) continue; - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService) continue; - const foldingRanges = cssLanguageService.getFoldingRanges(sourceMap.mappedDocument); + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs) continue; + const foldingRanges = cssLs.getFoldingRanges(sourceMap.mappedDocument); result = result.concat(toVueFoldingRanges(foldingRanges, sourceMap)); } return result; diff --git a/packages/vscode-vue-languageservice/src/services/selectionRanges.ts b/packages/vscode-vue-languageservice/src/services/selectionRanges.ts index cb1d919c0..41a6f1b19 100644 --- a/packages/vscode-vue-languageservice/src/services/selectionRanges.ts +++ b/packages/vscode-vue-languageservice/src/services/selectionRanges.ts @@ -63,10 +63,10 @@ export function register({ sourceFiles, tsLanguageService }: TsApiRegisterOption let result: SelectionRange[] = []; for (const position of positions) { for (const sourceMap of sourceFile.getCssSourceMaps()) { - const cssLanguageService = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); - if (!cssLanguageService || !sourceMap.stylesheet) continue; + const cssLs = sharedLs.getCssLs(sourceMap.mappedDocument.languageId); + if (!cssLs || !sourceMap.stylesheet) continue; for (const cssRange of sourceMap.getMappedRanges(position)) { - const selectRanges = cssLanguageService.getSelectionRanges(sourceMap.mappedDocument, [cssRange.start], sourceMap.stylesheet); + const selectRanges = cssLs.getSelectionRanges(sourceMap.mappedDocument, [cssRange.start], sourceMap.stylesheet); for (const selectRange of selectRanges) { const vueRange = sourceMap.getSourceRange(selectRange.range.start, selectRange.range.end); if (vueRange) { diff --git a/packages/vscode-vue-languageservice/src/sourceFile.ts b/packages/vscode-vue-languageservice/src/sourceFile.ts index 0d6a1870c..651f5159c 100644 --- a/packages/vscode-vue-languageservice/src/sourceFile.ts +++ b/packages/vscode-vue-languageservice/src/sourceFile.ts @@ -691,9 +691,9 @@ export function createSourceFile( const errors = computed(() => { let result = new Map(); for (const { textDocument, stylesheet } of documents.value) { - const cssLanguageService = sharedLs.getCssLs(textDocument.languageId); - if (!cssLanguageService || !stylesheet) continue; - const errs = cssLanguageService.doValidation(textDocument, stylesheet); + const cssLs = sharedLs.getCssLs(textDocument.languageId); + if (!cssLs || !stylesheet) continue; + const errs = cssLs.doValidation(textDocument, stylesheet); if (errs) result.set(textDocument.uri, errs); } return result; diff --git a/packages/vscode-vue-languageservice/src/virtuals/styles.raw.ts b/packages/vscode-vue-languageservice/src/virtuals/styles.raw.ts index d9b8a459f..ed3e0e834 100644 --- a/packages/vscode-vue-languageservice/src/virtuals/styles.raw.ts +++ b/packages/vscode-vue-languageservice/src/virtuals/styles.raw.ts @@ -38,10 +38,10 @@ export function useStylesRaw( stylesheet: css.Stylesheet, }[] = []; let stylesheet: css.Stylesheet | undefined = undefined; - const cssLanguageService = sharedLs.getCssLs(lang); - if (cssLanguageService) { - stylesheet = cssLanguageService.parseStylesheet(document); - findLinks(cssLanguageService, document, stylesheet); + const cssLs = sharedLs.getCssLs(lang); + if (cssLs) { + stylesheet = cssLs.parseStylesheet(document); + findLinks(cssLs, document, stylesheet); } documents.push({ textDocument: document,