diff --git a/packages/pug-language-service/src/pugDocument.ts b/packages/pug-language-service/src/pugDocument.ts index b69a02bbf..d8f62810c 100644 --- a/packages/pug-language-service/src/pugDocument.ts +++ b/packages/pug-language-service/src/pugDocument.ts @@ -42,13 +42,13 @@ export class SourceMap extends SourceMapBase { } public getSourceRange(start: T, end?: T, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, false, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, false, filter)) { + return mapped; } } public getMappedRange(start: T, end?: T, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, true, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, true, filter)) { + return mapped; } } public getSourceRanges(start: T, end?: T, filter?: (data: Data) => boolean) { @@ -68,18 +68,18 @@ export class SourceMap extends SourceMapBase { const startOffset = startIsNumber ? start : fromDoc.offsetAt(start); const endOffset = endIsNumber ? end : fromDoc.offsetAt(end); - for (const maped of super.getRanges(startOffset, endOffset, sourceToTarget, filter)) { - yield getMaped(maped); + for (const mapped of super.getRanges(startOffset, endOffset, sourceToTarget, filter)) { + yield getMapped(mapped); } - function getMaped(maped: [{ start: number, end: number }, Data]): [{ start: T, end: T }, Data] { + function getMapped(mapped: [{ start: number, end: number }, Data]): [{ start: T, end: T }, Data] { if (startIsNumber) { - return maped as [{ start: T, end: T }, Data]; + return mapped as [{ start: T, end: T }, Data]; } return [{ - start: toDoc.positionAt(maped[0].start) as T, - end: toDoc.positionAt(maped[0].end) as T, - }, maped[1]]; + start: toDoc.positionAt(mapped[0].start) as T, + end: toDoc.positionAt(mapped[0].end) as T, + }, mapped[1]]; } } } diff --git a/packages/source-map/src/index.ts b/packages/source-map/src/index.ts index 6977275ce..ec38bdbc2 100644 --- a/packages/source-map/src/index.ts +++ b/packages/source-map/src/index.ts @@ -65,13 +65,13 @@ export class SourceMapBase { } public getSourceRange(start: number, end?: number, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, false, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, false, filter)) { + return mapped; } } public getMappedRange(start: number, end?: number, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, true, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, true, filter)) { + return mapped; } } public getSourceRanges(start: number, end?: number, filter?: (data: Data) => boolean) { @@ -88,33 +88,33 @@ export class SourceMapBase { if (filter && !filter(mapping.data)) continue; - const maped = this.getRange(startOffset, endOffset, sourceToTarget, mapping.mode, mapping.sourceRange, mapping.mappedRange, mapping.data); - if (maped) { - yield getMaped(maped); + const mapped = this.getRange(startOffset, endOffset, sourceToTarget, mapping.mode, mapping.sourceRange, mapping.mappedRange, mapping.data); + if (mapped) { + yield getMapped(mapped); } else if (mapping.additional) { for (const other of mapping.additional) { - const maped = this.getRange(startOffset, endOffset, sourceToTarget, other.mode, other.sourceRange, other.mappedRange, mapping.data); - if (maped) { - yield getMaped(maped); + const mapped = this.getRange(startOffset, endOffset, sourceToTarget, other.mode, other.sourceRange, other.mappedRange, mapping.data); + if (mapped) { + yield getMapped(mapped); break; // only return first match additional range } } } } - function getMaped(maped: [{ start: number, end: number }, Data]) { - return maped; + function getMapped(mapped: [{ start: number, end: number }, Data]) { + return mapped; } } private getRange(start: number, end: number, sourceToTarget: boolean, mode: Mode, sourceRange: Range, targetRange: Range, data: Data): [{ start: number, end: number }, Data] | undefined { - const mapedToRange = sourceToTarget ? targetRange : sourceRange; - const mapedFromRange = sourceToTarget ? sourceRange : targetRange; + const mappedToRange = sourceToTarget ? targetRange : sourceRange; + const mappedFromRange = sourceToTarget ? sourceRange : targetRange; if (mode === Mode.Totally) { - if (start === mapedFromRange.start && end === mapedFromRange.end) { - const _start = mapedToRange.start; - const _end = mapedToRange.end; + if (start === mappedFromRange.start && end === mappedFromRange.end) { + const _start = mappedToRange.start; + const _end = mappedToRange.end; return [{ start: Math.min(_start, _end), end: Math.max(_start, _end), @@ -122,9 +122,9 @@ export class SourceMapBase { } } else if (mode === Mode.Offset) { - if (start >= mapedFromRange.start && end <= mapedFromRange.end) { - const _start = mapedToRange.start + start - mapedFromRange.start; - const _end = mapedToRange.end + end - mapedFromRange.end; + if (start >= mappedFromRange.start && end <= mappedFromRange.end) { + const _start = mappedToRange.start + start - mappedFromRange.start; + const _end = mappedToRange.end + end - mappedFromRange.end; return [{ start: Math.min(_start, _end), end: Math.max(_start, _end), @@ -132,9 +132,9 @@ export class SourceMapBase { } } else if (mode === Mode.Expand) { - if (start >= mapedFromRange.start && end <= mapedFromRange.end) { - const _start = mapedToRange.start; - const _end = mapedToRange.end; + if (start >= mappedFromRange.start && end <= mappedFromRange.end) { + const _start = mappedToRange.start; + const _end = mappedToRange.end; return [{ start: Math.min(_start, _end), end: Math.max(_start, _end), diff --git a/packages/vue-language-service/src/documentFeatures/autoInsert.ts b/packages/vue-language-service/src/documentFeatures/autoInsert.ts index 12b85cc3a..ff5bfc36a 100644 --- a/packages/vue-language-service/src/documentFeatures/autoInsert.ts +++ b/packages/vue-language-service/src/documentFeatures/autoInsert.ts @@ -14,12 +14,12 @@ export function register(context: DocumentServiceRuntimeContext) { position, sourceMap => true, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.completion, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.doAutoInsert?.(document, position, options), diff --git a/packages/vue-language-service/src/documentFeatures/colorPresentations.ts b/packages/vue-language-service/src/documentFeatures/colorPresentations.ts index 810a12603..1fb22a457 100644 --- a/packages/vue-language-service/src/documentFeatures/colorPresentations.ts +++ b/packages/vue-language-service/src/documentFeatures/colorPresentations.ts @@ -14,8 +14,8 @@ export function register(context: DocumentServiceRuntimeContext) { range, sourceMap => sourceMap.embeddedFile.capabilities.documentSymbol, // TODO: add color capabilitie setting function* (range, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges(range.start, range.end)) { - yield mapedRange; + for (const [mappedRange] of sourceMap.getMappedRanges(range.start, range.end)) { + yield mappedRange; } }, (plugin, document, range) => plugin.getColorPresentations?.(document, color, range), @@ -33,7 +33,7 @@ export function register(context: DocumentServiceRuntimeContext) { cp.textEdit.range = editRange; } - + if (cp.additionalTextEdits) { for (const textEdit of cp.additionalTextEdits) { diff --git a/packages/vue-language-service/src/documentFeatures/format.ts b/packages/vue-language-service/src/documentFeatures/format.ts index e100fea7a..710eabd91 100644 --- a/packages/vue-language-service/src/documentFeatures/format.ts +++ b/packages/vue-language-service/src/documentFeatures/format.ts @@ -169,11 +169,11 @@ function patchInterpolationIndent(vueDocument: VueDocument, sourceMap: EmbeddedD const indentTextEdits: vscode.TextEdit[] = []; const document = vueDocument.getDocument(); - for (const maped of sourceMap.mappings) { + for (const mapped of sourceMap.mappings) { const textRange = { - start: document.positionAt(maped.sourceRange.start), - end: document.positionAt(maped.sourceRange.end), + start: document.positionAt(mapped.sourceRange.start), + end: document.positionAt(mapped.sourceRange.end), }; const text = document.getText(textRange); @@ -182,7 +182,7 @@ function patchInterpolationIndent(vueDocument: VueDocument, sourceMap: EmbeddedD const lines = text.split('\n'); const removeIndent = getRemoveIndent(lines); - const baseIndent = getBaseIndent(maped.sourceRange.start); + const baseIndent = getBaseIndent(mapped.sourceRange.start); for (let i = 1; i < lines.length; i++) { const line = lines[i]; diff --git a/packages/vue-language-service/src/documentFeatures/linkedEditingRanges.ts b/packages/vue-language-service/src/documentFeatures/linkedEditingRanges.ts index ed9a8ff51..238dfd06e 100644 --- a/packages/vue-language-service/src/documentFeatures/linkedEditingRanges.ts +++ b/packages/vue-language-service/src/documentFeatures/linkedEditingRanges.ts @@ -14,12 +14,12 @@ export function register(context: DocumentServiceRuntimeContext) { position, sourceMap => true, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.completion, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.findLinkedEditingRanges?.(document, position), diff --git a/packages/vue-language-service/src/languageFuatures/callHierarchy.ts b/packages/vue-language-service/src/languageFuatures/callHierarchy.ts index ab385c385..8115dbdee 100644 --- a/packages/vue-language-service/src/languageFuatures/callHierarchy.ts +++ b/packages/vue-language-service/src/languageFuatures/callHierarchy.ts @@ -26,12 +26,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.references, )) { - yield mapedRange.start; + yield mappedRange.start; } }, async (plugin, document, position, sourceMap) => { diff --git a/packages/vue-language-service/src/languageFuatures/definition.ts b/packages/vue-language-service/src/languageFuatures/definition.ts index 0705a05d6..c13e5eba6 100644 --- a/packages/vue-language-service/src/languageFuatures/definition.ts +++ b/packages/vue-language-service/src/languageFuatures/definition.ts @@ -20,12 +20,12 @@ export function register( uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, isValidMappingData, )) { - yield mapedRange.start; + yield mappedRange.start; } }, async (plugin, document, position, sourceMap) => { diff --git a/packages/vue-language-service/src/languageFuatures/documentHighlights.ts b/packages/vue-language-service/src/languageFuatures/documentHighlights.ts index 87a7894a0..63e8700f4 100644 --- a/packages/vue-language-service/src/languageFuatures/documentHighlights.ts +++ b/packages/vue-language-service/src/languageFuatures/documentHighlights.ts @@ -12,12 +12,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.basic, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.findDocumentHighlights?.(document, position), diff --git a/packages/vue-language-service/src/languageFuatures/documentLinks.ts b/packages/vue-language-service/src/languageFuatures/documentLinks.ts index 000304e4e..0be505417 100644 --- a/packages/vue-language-service/src/languageFuatures/documentLinks.ts +++ b/packages/vue-language-service/src/languageFuatures/documentLinks.ts @@ -44,15 +44,15 @@ export function register(context: LanguageServiceRuntimeContext) { for (const sourceMap of vueDocument.getSourceMaps()) { - for (const maped of sourceMap.mappings) { + for (const mapped of sourceMap.mappings) { - if (!maped.data.capabilities.displayWithLink) + if (!mapped.data.capabilities.displayWithLink) continue; result.push({ range: { - start: document.positionAt(maped.sourceRange.start), - end: document.positionAt(maped.sourceRange.end), + start: document.positionAt(mapped.sourceRange.start), + end: document.positionAt(mapped.sourceRange.end), }, target: uri, // TODO }); diff --git a/packages/vue-language-service/src/languageFuatures/hover.ts b/packages/vue-language-service/src/languageFuatures/hover.ts index 866efb39b..5eb453aee 100644 --- a/packages/vue-language-service/src/languageFuatures/hover.ts +++ b/packages/vue-language-service/src/languageFuatures/hover.ts @@ -12,12 +12,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.basic, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.doHover?.(document, position), diff --git a/packages/vue-language-service/src/languageFuatures/references.ts b/packages/vue-language-service/src/languageFuatures/references.ts index d446a70c2..4672c3d04 100644 --- a/packages/vue-language-service/src/languageFuatures/references.ts +++ b/packages/vue-language-service/src/languageFuatures/references.ts @@ -14,12 +14,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.references, )) { - yield mapedRange.start; + yield mappedRange.start; } }, async (plugin, document, position, sourceMap, vueDocument) => { diff --git a/packages/vue-language-service/src/languageFuatures/rename.ts b/packages/vue-language-service/src/languageFuatures/rename.ts index 12a4c0368..a340c6936 100644 --- a/packages/vue-language-service/src/languageFuatures/rename.ts +++ b/packages/vue-language-service/src/languageFuatures/rename.ts @@ -14,7 +14,7 @@ export function register(context: LanguageServiceRuntimeContext) { uri, { position, newName }, function* (arg, sourceMap) { - for (const [mapedRange, mapedData] of sourceMap.getMappedRanges( + for (const [mappedRange, mappedData] of sourceMap.getMappedRanges( arg.position, arg.position, data => typeof data.capabilities.rename === 'object' ? data.capabilities.rename.in : !!data.capabilities.rename, @@ -22,10 +22,10 @@ export function register(context: LanguageServiceRuntimeContext) { let newName = arg.newName; - if (mapedData.normalizeNewName) - newName = mapedData.normalizeNewName(arg.newName); + if (mappedData.normalizeNewName) + newName = mappedData.normalizeNewName(arg.newName); - yield { position: mapedRange.start, newName }; + yield { position: mappedRange.start, newName }; } }, async (plugin, document, arg, sourceMap) => { @@ -189,10 +189,10 @@ export function margeWorkspaceEdits(original: vscode.WorkspaceEdit, ...others: v /** * TODO: rewrite this - * + * * Start from Script LS * -> Access all results - * + * * Start from template LS * -> Start from template content? * -> Access all results diff --git a/packages/vue-language-service/src/languageFuatures/renamePrepare.ts b/packages/vue-language-service/src/languageFuatures/renamePrepare.ts index 7449921dc..3a9c70b0e 100644 --- a/packages/vue-language-service/src/languageFuatures/renamePrepare.ts +++ b/packages/vue-language-service/src/languageFuatures/renamePrepare.ts @@ -11,12 +11,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.rename, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.doRenamePrepare?.(document, position), diff --git a/packages/vue-language-service/src/languageFuatures/signatureHelp.ts b/packages/vue-language-service/src/languageFuatures/signatureHelp.ts index 0f0b11f69..b79abcf45 100644 --- a/packages/vue-language-service/src/languageFuatures/signatureHelp.ts +++ b/packages/vue-language-service/src/languageFuatures/signatureHelp.ts @@ -11,12 +11,12 @@ export function register(context: LanguageServiceRuntimeContext) { uri, position, function* (position, sourceMap) { - for (const [mapedRange] of sourceMap.getMappedRanges( + for (const [mappedRange] of sourceMap.getMappedRanges( position, position, data => !!data.capabilities.completion, )) { - yield mapedRange.start; + yield mappedRange.start; } }, (plugin, document, position) => plugin.getSignatureHelp?.(document, position, signatureHelpContext), diff --git a/packages/vue-language-service/src/utils/featureWorkers.ts b/packages/vue-language-service/src/utils/featureWorkers.ts index 3af0458b9..161f16641 100644 --- a/packages/vue-language-service/src/utils/featureWorkers.ts +++ b/packages/vue-language-service/src/utils/featureWorkers.ts @@ -53,11 +53,11 @@ export async function documentArgFeatureWorker( context.updateTsLs(sourceMap.mappedDocument); - for (const mapedArg of transformArg(arg, sourceMap)) { + for (const mappedArg of transformArg(arg, sourceMap)) { for (const plugin of plugins) { - const embeddedResult = await worker(plugin, sourceMap.mappedDocument, mapedArg); + const embeddedResult = await worker(plugin, sourceMap.mappedDocument, mappedArg); if (!embeddedResult) continue; @@ -135,11 +135,11 @@ export async function languageFeatureWorker( const plugins = context.getPlugins(sourceMap.embeddedFile.lsType); - for (const mapedArg of transformArg(arg, sourceMap)) { + for (const mappedArg of transformArg(arg, sourceMap)) { for (const plugin of plugins) { - const embeddedResult = await worker(plugin, sourceMap.mappedDocument, mapedArg, sourceMap, vueDocument); + const embeddedResult = await worker(plugin, sourceMap.mappedDocument, mappedArg, sourceMap, vueDocument); if (!embeddedResult) continue; diff --git a/packages/vue-language-service/src/vueDocuments.ts b/packages/vue-language-service/src/vueDocuments.ts index 7be396efd..f530b5949 100644 --- a/packages/vue-language-service/src/vueDocuments.ts +++ b/packages/vue-language-service/src/vueDocuments.ts @@ -23,13 +23,13 @@ export class SourceMap extends SourceMapBase { } public getSourceRange(start: T, end?: T, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, false, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, false, filter)) { + return mapped; } } public getMappedRange(start: T, end?: T, filter?: (data: Data) => boolean) { - for (const maped of this.getRanges(start, end ?? start, true, filter)) { - return maped; + for (const mapped of this.getRanges(start, end ?? start, true, filter)) { + return mapped; } } public getSourceRanges(start: T, end?: T, filter?: (data: Data) => boolean) { @@ -49,18 +49,18 @@ export class SourceMap extends SourceMapBase { const startOffset = startIsNumber ? start : fromDoc.offsetAt(start); const endOffset = endIsNumber ? end : fromDoc.offsetAt(end); - for (const maped of super.getRanges(startOffset, endOffset, sourceToTarget, filter)) { - yield getMaped(maped); + for (const mapped of super.getRanges(startOffset, endOffset, sourceToTarget, filter)) { + yield getMapped(mapped); } - function getMaped(maped: [{ start: number, end: number }, Data]): [{ start: T, end: T }, Data] { + function getMapped(mapped: [{ start: number, end: number }, Data]): [{ start: T, end: T }, Data] { if (startIsNumber) { - return maped as [{ start: T, end: T }, Data]; + return mapped as [{ start: T, end: T }, Data]; } return [{ - start: toDoc.positionAt(maped[0].start) as T, - end: toDoc.positionAt(maped[0].end) as T, - }, maped[1]]; + start: toDoc.positionAt(mapped[0].start) as T, + end: toDoc.positionAt(mapped[0].end) as T, + }, mapped[1]]; } } } diff --git a/packages/vue-language-service/src/vuePlugins/autoWrapParentheses.ts b/packages/vue-language-service/src/vuePlugins/autoWrapParentheses.ts index 41df6e892..18eba5f0e 100644 --- a/packages/vue-language-service/src/vuePlugins/autoWrapParentheses.ts +++ b/packages/vue-language-service/src/vuePlugins/autoWrapParentheses.ts @@ -31,9 +31,9 @@ export default function (host: { const offset = document.offsetAt(position); - for (const mapedRange of templateFormatScript.sourceMap.mappings) { - if (mapedRange.sourceRange.end === offset) { - const text = document.getText().substring(mapedRange.sourceRange.start, mapedRange.sourceRange.end); + for (const mappedRange of templateFormatScript.sourceMap.mappings) { + if (mappedRange.sourceRange.end === offset) { + const text = document.getText().substring(mappedRange.sourceRange.start, mappedRange.sourceRange.end); const ast = host.ts.createSourceFile(templateFormatScript.file.fileName, text, host.ts.ScriptTarget.Latest); if (ast.statements.length === 1) { const statement = ast.statements[0]; @@ -46,8 +46,8 @@ export default function (host: { ) { return vscode.TextEdit.replace( { - start: document.positionAt(mapedRange.sourceRange.start), - end: document.positionAt(mapedRange.sourceRange.end), + start: document.positionAt(mappedRange.sourceRange.start), + end: document.positionAt(mappedRange.sourceRange.end), }, '(' + text + '$0' + ')', ); diff --git a/packages/vue-language-service/src/vuePlugins/htmlPugConversions.ts b/packages/vue-language-service/src/vuePlugins/htmlPugConversions.ts index 3847024d2..1bb4b8497 100644 --- a/packages/vue-language-service/src/vuePlugins/htmlPugConversions.ts +++ b/packages/vue-language-service/src/vuePlugins/htmlPugConversions.ts @@ -34,11 +34,11 @@ export default function (host: { const sourceMap = vueDocument.sourceMapsMap.get(embeddedTemplate); - for (const maped of sourceMap.mappings) { + for (const mapped of sourceMap.mappings) { return [{ range: { - start: sourceMap.sourceDocument.positionAt(maped.sourceRange.start), - end: sourceMap.sourceDocument.positionAt(maped.sourceRange.start), + start: sourceMap.sourceDocument.positionAt(mapped.sourceRange.start), + end: sourceMap.sourceDocument.positionAt(mapped.sourceRange.start), }, command: { title: 'pug ' + (embeddedTemplate.file.lang === 'pug' ? '☑' : '☐'), diff --git a/packages/vue-tsc/src/apis.ts b/packages/vue-tsc/src/apis.ts index 197c8f716..346003849 100644 --- a/packages/vue-tsc/src/apis.ts +++ b/packages/vue-tsc/src/apis.ts @@ -46,13 +46,13 @@ export function register( if (sourceFile) { - const maped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName); + const mapped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName); - if (maped) { + if (mapped) { let results: ts.Diagnostic[] = []; - const embeddeds = maped.vueFile.getAllEmbeddeds(); + const embeddeds = mapped.vueFile.getAllEmbeddeds(); for (const embedded of embeddeds) { @@ -118,7 +118,7 @@ export function register( if (!context.vueLsHost.fileExists?.(tsOrVueLoc.fileName)) continue; - if (!tsOrVueLoc.maped && lsType !== 'script') + if (!tsOrVueLoc.mapped && lsType !== 'script') continue; let file = tsOrVueLoc.fileName === diagnostic.file.fileName @@ -126,7 +126,7 @@ export function register( : undefined; if (!file) { - let docText = tsOrVueLoc.maped?.vueFile.getContent(); + let docText = tsOrVueLoc.mapped?.vueFile.getContent(); if (docText === undefined) { const snapshot = context.vueLsHost.getScriptSnapshot(tsOrVueLoc.fileName); diff --git a/packages/vue-typescript/src/typescriptRuntime.ts b/packages/vue-typescript/src/typescriptRuntime.ts index 85936a775..f749a4fe1 100644 --- a/packages/vue-typescript/src/typescriptRuntime.ts +++ b/packages/vue-typescript/src/typescriptRuntime.ts @@ -222,8 +222,8 @@ export function createTypeScriptRuntime(options: { const tsFileNames = getLocalTypesFiles(lsType); - for (const maped of vueFiles.getEmbeddeds(lsType)) { - tsFileNames.push(maped.embedded.file.fileName); // virtual .ts + for (const mapped of vueFiles.getEmbeddeds(lsType)) { + tsFileNames.push(mapped.embedded.file.fileName); // virtual .ts } for (const fileName of options.vueLsHost.getScriptFileNames()) { @@ -242,18 +242,18 @@ export function createTypeScriptRuntime(options: { if (basename === localTypes.typesFileName) { return ''; } - let maped = vueFiles.fromEmbeddedFileName(lsType, fileName); - if (maped) { - if (fileVersions.has(maped.embedded.file)) { - return fileVersions.get(maped.embedded.file)!; + let mapped = vueFiles.fromEmbeddedFileName(lsType, fileName); + if (mapped) { + if (fileVersions.has(mapped.embedded.file)) { + return fileVersions.get(mapped.embedded.file)!; } else { - let version = ts.sys.createHash?.(maped.embedded.file.content) ?? maped.embedded.file.content; + let version = ts.sys.createHash?.(mapped.embedded.file.content) ?? mapped.embedded.file.content; if (options.isVueTsc) { // fix https://github.com/johnsoncodehk/volar/issues/1082 - version = maped.vueFile.getVersion() + ':' + version; + version = mapped.vueFile.getVersion() + ':' + version; } - fileVersions.set(maped.embedded.file, version); + fileVersions.set(mapped.embedded.file, version); return version; } } @@ -269,9 +269,9 @@ export function createTypeScriptRuntime(options: { if (basename === localTypes.typesFileName) { return localTypesScript; } - const maped = vueFiles.fromEmbeddedFileName(lsType, fileName); - if (maped) { - const text = maped.embedded.file.content; + const mapped = vueFiles.fromEmbeddedFileName(lsType, fileName); + if (mapped) { + const text = mapped.embedded.file.content; const snapshot = ts.ScriptSnapshot.fromString(text); scriptSnapshots.set(fileName.toLowerCase(), [version, snapshot]); return snapshot; diff --git a/packages/vue-typescript/src/use/useSfcTemplateScript.ts b/packages/vue-typescript/src/use/useSfcTemplateScript.ts index 905263742..8fd58c331 100644 --- a/packages/vue-typescript/src/use/useSfcTemplateScript.ts +++ b/packages/vue-typescript/src/use/useSfcTemplateScript.ts @@ -311,9 +311,9 @@ export function useSfcTemplateScript( ]) { const cssSourceMap = styleEmbeddeds.value.find(embedded => embedded.file.fileName === fileName)?.sourceMap; if (!cssSourceMap) continue; - for (const maped of mappings) { - const tsRange = maped.tsRange; - for (const cssRange of maped.cssRanges) { + for (const mapped of mappings) { + const tsRange = mapped.tsRange; + for (const cssRange of mapped.cssRanges) { const vueRange = cssSourceMap.getSourceRange(cssRange.start, cssRange.end)?.[0]; if (!vueRange) continue; sourceMap.mappings.push({ @@ -322,12 +322,12 @@ export function useSfcTemplateScript( capabilities: { references: true, rename: true, - referencesCodeLens: maped.mode === SourceMaps.Mode.Totally, // has 2 modes + referencesCodeLens: mapped.mode === SourceMaps.Mode.Totally, // has 2 modes }, - normalizeNewName: maped.patchRename ? beforeCssRename : undefined, - applyNewName: maped.patchRename ? doCssRename : undefined, + normalizeNewName: mapped.patchRename ? beforeCssRename : undefined, + applyNewName: mapped.patchRename ? doCssRename : undefined, }, - mode: maped.mode, + mode: mapped.mode, sourceRange: vueRange, mappedRange: tsRange, }); @@ -460,8 +460,8 @@ export function useSfcTemplateScript( } : undefined; const sourceMap = new Teleport(); - for (const maped of data.value.ctxMappings) { - sourceMap.mappings.push(maped); + for (const mapped of data.value.ctxMappings) { + sourceMap.mappings.push(mapped); } teleport.value = sourceMap; } diff --git a/packages/vue-typescript/src/vueFiles.ts b/packages/vue-typescript/src/vueFiles.ts index 7ab4de0f7..72505e79a 100644 --- a/packages/vue-typescript/src/vueFiles.ts +++ b/packages/vue-typescript/src/vueFiles.ts @@ -96,18 +96,18 @@ export function createVueFiles() { if (end === undefined) end = start; - const maped = sourceMapsByFileNameAndLsType.value[lsType].get(fileName.toLowerCase()); + const mapped = sourceMapsByFileNameAndLsType.value[lsType].get(fileName.toLowerCase()); - if (maped) { + if (mapped) { - if (sourceMapFilter && !sourceMapFilter(maped.embedded.sourceMap)) + if (sourceMapFilter && !sourceMapFilter(mapped.embedded.sourceMap)) return; - for (const vueRange of maped.embedded.sourceMap.getSourceRanges(start, end, filter)) { + for (const vueRange of mapped.embedded.sourceMap.getSourceRanges(start, end, filter)) { yield { - fileName: maped.vueFile.fileName, + fileName: mapped.vueFile.fileName, range: vueRange[0], - maped: maped, + mapped: mapped, data: vueRange[1], }; }