Skip to content

Rename scope facets #2832

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

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Rename scope facets #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0e6f71
Rename resource
AndreasArvidsson Feb 6, 2025
974b49a
Renamed named function iteration
AndreasArvidsson Feb 6, 2025
4be5630
Renamed function name iteration
AndreasArvidsson Feb 6, 2025
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
0 ...ixtures/scopes/python/interior.with.scope → ...res/scopes/python/interior.resource.scope
View file
Open in desktop
File renamed without changes.
0 .../scopes/scss/functionName.iteration.scope → ...s/scss/functionName.iteration.block.scope
View file
Open in desktop
File renamed without changes.
0 ...scopes/scss/namedFunction.iteration.scope → .../scss/namedFunction.iteration.block.scope
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/common/src/scopeSupportFacets/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
"interior.switchCase": supported,
"interior.ternary": supported,
"interior.loop": supported,
"interior.with": supported,
"interior.resource": supported,

element: notApplicable,
tags: notApplicable,
Expand Down
14 changes: 8 additions & 6 deletions packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,9 @@ export const scopeSupportFacetInfos: Record<
description: "A constructor declaration in a class",
scopeType: "namedFunction",
},
"namedFunction.iteration": {
description: "Iteration scope for named functions",
"namedFunction.iteration.block": {
description:
"Iteration scope for named functions. Statement blocks(body of functions/if classes/for loops/etc).",
scopeType: "namedFunction",
isIteration: true,
},
Expand Down Expand Up @@ -180,8 +181,9 @@ export const scopeSupportFacetInfos: Record<
description: "The name of a constructor in a class",
scopeType: "functionName",
},
"functionName.iteration": {
description: "Iteration scope for function names",
"functionName.iteration.block": {
description:
"Iteration scope for function names. Statement blocks(body of functions/if classes/for loops/etc).",
scopeType: "functionName",
isIteration: true,
},
Expand Down Expand Up @@ -749,8 +751,8 @@ export const scopeSupportFacetInfos: Record<
description: "The body of an for/while loop",
scopeType: { type: "interior" },
},
"interior.with": {
description: "The body of an with/use/using statement",
"interior.resource": {
description: "the body of a 'with' / 'use' / 'using' statement",
scopeType: { type: "interior" },
},

Expand Down
6 changes: 3 additions & 3 deletions packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ export const scopeSupportFacets = [
"anonymousFunction",

"namedFunction",
"namedFunction.iteration",
"namedFunction.iteration.block",
"namedFunction.iteration.document",
"namedFunction.method",
"namedFunction.method.iteration.class",
"namedFunction.constructor",

"functionName",
"functionName.iteration",
"functionName.iteration.block",
"functionName.iteration.document",
"functionName.method",
"functionName.method.iteration.class",
Expand Down Expand Up @@ -185,7 +185,7 @@ export const scopeSupportFacets = [
"interior.switchCase",
"interior.ternary",
"interior.loop",
"interior.with",
"interior.resource",

"notebookCell",

Expand Down
4 changes: 2 additions & 2 deletions packages/common/src/scopeSupportFacets/scss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
export const scssScopeSupport: LanguageScopeSupportFacetMap = {
...cssScopeSupport,

"namedFunction.iteration": supported,
"namedFunction.iteration.block": supported,
"namedFunction.iteration.document": supported,
"functionName.iteration": supported,
"functionName.iteration.block": supported,
"functionName.iteration.document": supported,
"comment.line": supported,
disqualifyDelimiter: supported,
Expand Down
2 changes: 1 addition & 1 deletion packages/cursorless-org-docs/src/docs/contributing/adding-a-new-scope.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ For example, if you'd like to add support for the `namedFunction` facet of the `
"namedFunction.method": supported,
"namedFunction.method.iteration.class": supported,
"namedFunction.constructor": supported,
"namedFunction.iteration": supported,
"namedFunction.iteration.block": supported,
"namedFunction.iteration.document": supported,
```

Expand Down
Loading