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

fix: update tm language with new markdown frontmatter specs #506

Merged
merged 3 commits into from
Aug 6, 2024

Conversation

mcanouil
Copy link
Contributor

@mcanouil mcanouil commented Aug 5, 2024

From #501 (comment)

FrontMatter integration should be updated to match Markdowns

frontMatter:
begin: \A-{3}\s*$
contentName: meta.embedded.block.frontmatter
patterns:
- {include: source.yaml}
end: (^|\G)-{3}|\.{3}\s*$

microsoft/vscode-markdown-tm-grammar#162

https://github.com/microsoft/vscode-markdown-tm-grammar/blob/main/markdown.tmLanguage.base.yaml#L202-L216

Fixes #501, fixes #504, fixes #505

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 5, 2024

I'm not entirely sure this is enough as running yarn dev-vscode and running the extension with this change does not seem to fix the issue but I might be missing something in the setup/use of the extension in a development setting.

Edit: I've figured the missing step: node apps/vscode/syntaxes/build-lang.js
I confirmed in the debug mode that the issue is gone.

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 5, 2024

Also tracking the TM language change on Positron side:

Copy link
Collaborator

@juliasilge juliasilge left a comment

Choose a reason for hiding this comment

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

The .vsix built from this PR works fine with the current release build of Positron. See some details here.

Positron won't merge the upstream Code OSS release until later this week FYI.

@juliasilge
Copy link
Collaborator

We will want to bump the Quarto extension version at the same time that we merge in upstream Code OSS if possible.

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 5, 2024

Feel free to take over the PR to make the additional changes you might need (or make another PR after this one).

@juliasilge
Copy link
Collaborator

juliasilge commented Aug 5, 2024

Edited to clarify:

From my perspective, this PR is ready to go and can be merged. ✅

Additionally perhaps separately, it would be nice to update the extension version in this repo so it makes a bit more sense for dev work. The .vsix says this is version 1.111.0 but the current release is 1.113.0

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 5, 2024

Let me grab a laptop.

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 5, 2024

I've bumped the version to 1.114.0 (minor) and added a changelog entry.

@mcanouil
Copy link
Contributor Author

mcanouil commented Aug 6, 2024

@juliasilge FYI, I don't have any permission here so I cannot proceed further.

@jjallaire jjallaire merged commit 8513e7e into quarto-dev:main Aug 6, 2024
1 check passed
@andyatsenversa
Copy link

I just updated my VSCode extension - and no more red text, the fix appears to be working.
Thanks everyone

@cderv cderv mentioned this pull request Aug 12, 2024
@cderv cderv linked an issue Aug 12, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants