Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Terser leading/trailing syntax in scm #2113

Merged
merged 5 commits into from
Dec 11, 2023
+115 −117
Merged

Terser leading/trailing syntax in scm #2113

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d61980
Terser leading/trailing syntax in scm
AndreasArvidsson Dec 9, 2023
4affe6f
rename
AndreasArvidsson Dec 9, 2023
f5dc428
Attempt at tweaking related range code
pokey Dec 11, 2023
aad917c
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Dec 11, 2023
684c094
Use correct position
AndreasArvidsson Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Attempt at tweaking related range code
@pokey
pokey committed Dec 11, 2023
commit f5dc4281f295a47961db47e6f867723ee939d6e7
36 changes: 18 additions & 18 deletions ...c/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterScopeHandler.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import {
Position,
Range,
SimpleScopeType,
TextEditor,
} from "@cursorless/common";
@@ -67,20 +65,26 @@ export class TreeSitterScopeHandler extends BaseTreeSitterScopeHandler {
true,
);

const prefixRange = createRangeWithPosition(
getRelatedRange(match, scopeTypeType, "prefix", true),
contentRange.start,
);
const prefixRange = getRelatedRange(
match,
scopeTypeType,
"prefix",
true,
)?.with(undefined, contentRange.start);

const leadingDelimiterRange = createRangeWithPosition(
getRelatedRange(match, scopeTypeType, "leading", true),
prefixRange?.start ?? contentRange.start,
);
const leadingDelimiterRange = getRelatedRange(
match,
scopeTypeType,
"leading",
true,
)?.with(undefined, prefixRange?.start ?? contentRange.start);

const trailingDelimiterRange = createRangeWithPosition(
getRelatedRange(match, scopeTypeType, "trailing", true),
contentRange.end,
);
const trailingDelimiterRange = getRelatedRange(
match,
scopeTypeType,
"trailing",
true,
)?.with(contentRange.start);

return {
editor,
@@ -103,7 +107,3 @@ export class TreeSitterScopeHandler extends BaseTreeSitterScopeHandler {
};
}
}

function createRangeWithPosition(range: Range | undefined, position: Position) {
return range != null ? range.union(position.toEmptyRange()) : undefined;
}