fix: Fix vscode-graphql-syntax’s grammar to support string literals on separate lines [Reapply & Fix] #3545
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 1bd052b The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
kitten
changed the title
|
Zip containing a |
|
thank you @kitten !!! looks awesome! |
acao
reviewed
Mar 3, 2024
packages/vscode-graphql-syntax/tests/__snapshots__/markdown-grammar.spec.ts.snap
Outdated
Show resolved
Hide resolved
…n separate lines (graphql#3518) * Allow newlines after `graphql(` before start of query string * Fix mistaken reverse order of optional `(` and generic `<.*>` * Replace `(` in second match with newline one * Match graphql calls separately for string literals inside calls * Add missing endCaptures to new rule
Using a positive lookbehind can subtly break Textmate/VSCode’s syntax highlighting. The positive lookbehind (according to some online sources) can fail unexpectedly when they contain whitespace matches. This means that we should instead match explicitly, like the other patterns do. This means however, that we might match too much and I noticed that arguments to the function aren't highlighted correctly. According to the interpolation rule in `graphql.json` we now include patterns for JS/TS/etc as a fallback pattern. This fixes the issue and prevents the case where the rule was conflicting with normal JS/TS patterns in a different tmLanguage grammar.
kitten
force-pushed
the
fix/graphql-syntax-newlines-reapply
branch
from
562499c
to
1bd052b
Compare
|
Rebased & reverted changes to |
acao
approved these changes
Mar 16, 2024
acao
approved these changes
Mar 16, 2024
Merged
This was referenced Apr 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #3542
Reapplies: #3518
Related: #3543
The previous implementation for GraphQL template string literals inside function expression caused a subtle error in syntax highlighting.
Because it used a positive lookbehind that contained whitespace matches, this caused an issue with syntax matching, which breaks subsequent TS/JS rules from matching. In other words, it caused a conflict between built-in highlighting and the embedded GraphQL highlighting.
Instead of this, we now match the function expressions explicitly, and include JS/TS rules inside the match to also fix arguments that live alongside the GraphQL template string.