Skip to content

Commit

Permalink
[chore] fix maped typo (#1107)
Browse files Browse the repository at this point in the history
  • Loading branch information
@HerringtonDarkholme
HerringtonDarkholme committed Mar 25, 2022
1 parent ef68c1e commit 35189e8
Show file tree
Hide file tree
Showing 23 changed files with 124 additions and 124 deletions.
22 changes: 11 additions & 11 deletions packages/pug-language-service/src/pugDocument.ts
View file
Expand Up @@ -42,13 +42,13 @@ export class SourceMap<Data = undefined> extends SourceMapBase<Data> {
}

public getSourceRange<T extends number | vscode.Position>(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<T extends number | vscode.Position>(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<T extends number | vscode.Position>(start: T, end?: T, filter?: (data: Data) => boolean) {
Expand All @@ -68,18 +68,18 @@ export class SourceMap<Data = undefined> extends SourceMapBase<Data> {
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]];
}
}
}
46 changes: 23 additions & 23 deletions packages/source-map/src/index.ts
View file
Expand Up @@ -65,13 +65,13 @@ export class SourceMapBase<Data = undefined> {
}

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) {
Expand All @@ -88,53 +88,53 @@ export class SourceMapBase<Data = undefined> {
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),
}, data];
}
}
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),
}, data];
}
}
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),
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/documentFeatures/autoInsert.ts
View file
Expand Up @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions packages/vue-language-service/src/documentFeatures/colorPresentations.ts
View file
Expand Up @@ -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),
Expand All @@ -33,7 +33,7 @@ export function register(context: DocumentServiceRuntimeContext) {

cp.textEdit.range = editRange;
}

if (cp.additionalTextEdits) {
for (const textEdit of cp.additionalTextEdits) {

Expand Down
8 changes: 4 additions & 4 deletions packages/vue-language-service/src/documentFeatures/format.ts
View file
Expand Up @@ -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);

Expand All @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/documentFeatures/linkedEditingRanges.ts
View file
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/callHierarchy.ts
View file
Expand Up @@ -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) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/definition.ts
View file
Expand Up @@ -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) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/documentHighlights.ts
View file
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions packages/vue-language-service/src/languageFuatures/documentLinks.ts
View file
Expand Up @@ -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
});
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/hover.ts
View file
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/references.ts
View file
Expand Up @@ -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) => {
Expand Down
12 changes: 6 additions & 6 deletions packages/vue-language-service/src/languageFuatures/rename.ts
View file
Expand Up @@ -14,18 +14,18 @@ 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,
)) {

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) => {
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/renamePrepare.ts
View file
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-service/src/languageFuatures/signatureHelp.ts
View file
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions packages/vue-language-service/src/utils/featureWorkers.ts
View file
Expand Up @@ -53,11 +53,11 @@ export async function documentArgFeatureWorker<T, K>(

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;
Expand Down Expand Up @@ -135,11 +135,11 @@ export async function languageFeatureWorker<T, K>(

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;
Expand Down

0 comments on commit 35189e8

Please sign in to comment.