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.

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

css scope migration #2339

Merged
merged 9 commits into from
May 31, 2024
Merged

css scope migration #2339

merged 9 commits into from
May 31, 2024

Conversation

AndreasArvidsson
Copy link
Member

Checklist

  • [/] I have added tests
  • [/] I have updated the docs and cheatsheet
  • [/] I have not broken the cheatsheet

@auscompgeek auscompgeek added the scope-migration Migrating scopes to next-gen scope implementation label May 18, 2024
Copy link
Member

@pokey pokey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you forgot to add iteration scopes. I added them, along with some fixture tests. I also added a few new fixture types while I was here. Worth having a look at those fixture ID's. I think they're logical but they may warrant some discussion. See my changes in https://github.com/cursorless-dev/cursorless/pull/2339/files/13d759c3b090dd3872d2e170701521811b76436d..9496ae08a6f2dc5456e8a15ffca676affd52dc70

Merge if you're happy

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fact that this was missing inspired #2370, which also includes this file

scopeType: "namedFunction",
isIteration: true,
},
"namedFunction.iteration": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pokey There's no indicator in the name or description what this iteration scope should be. Shouldn't this be namedFunction.iteration.block?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah so the issue is that we don't necessarily want the iteration scope for functions to always include blocks. For example, that's not what we do in typescript. I added this as a catch-all so that I could include blocks for css. Might be worth discussing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can us go ahead and merge this because we can always update later?

Copy link
Member

@pokey pokey May 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slightly mixed feelings about merging in facet ids that we will want to change, as I think it could be a bit painful to rename them, especially as they get used more

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly. Should be punt on this then?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Would be good to get this PR in, but I think it's going to be easier to get this one right, as we use this facet for this PR. I'd be inclined to discuss Sunday

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought, let's get this thing in. I filed #2375; let's discuss Sunday

@pokey pokey added this pull request to the merge queue May 31, 2024
Merged via the queue into main with commit 820732a May 31, 2024
15 checks passed
@pokey pokey deleted the css_migration branch May 31, 2024 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scope-migration Migrating scopes to next-gen scope implementation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants