cursorless-dev/cursorless
1
1
Fork 0
mirror of https://github.com/cursorless-dev/cursorless.git synced 2024-10-05 05:17:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix spinning unmatched delimiter (#343)

Browse Source
This commit is contained in:
Pokey Rule 2021-11-29 16:53:16 +00:00 committed by GitHub
parent 1de4725842
commit b07bee49a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/processTargets/modifiers/surroundingPair/findSurroundingPairTextBased.ts
View File

@ -255,6 +255,12 @@ function getDelimiterPairOffsets(
(match, index) => {
const startOffset = match.index!;
const matchText = match[0];
// NB: It is important to cache here because otherwise the algorithm that
// disambiguates delimiters of unknown side goes badly super linear
let hasCachedDelimiterInfo = false;
let cachedDelimiterInfo: IndividualDelimiter | undefined = undefined;
return {
offsets: {
start: startOffset,
@ -262,20 +268,29 @@ function getDelimiterPairOffsets(
},
get delimiterInfo() {
const delimiterInfo = delimiterTextToDelimiterInfoMap[matchText];
if (hasCachedDelimiterInfo) {
return cachedDelimiterInfo;
}
const rawDelimiterInfo = delimiterTextToDelimiterInfoMap[matchText];
let side =
delimiterInfo.side === "unknown" && forceDirection == null
rawDelimiterInfo.side === "unknown" && forceDirection == null
? inferDelimiterSide(
text,
delimiterOccurrences,
index,
delimiterInfo?.delimiter,
rawDelimiterInfo?.delimiter,
startOffset
)
: delimiterInfo.side;
: rawDelimiterInfo.side;
return { ...delimiterInfo, side };
const delimiterInfo = { ...rawDelimiterInfo, side };
hasCachedDelimiterInfo = true;
cachedDelimiterInfo = delimiterInfo;
return delimiterInfo;
},
};
}