Update tmLanguage.json files to the latest #7019
Conversation
| @@ -1,19 +1,19 @@ | |||
| { | |||
| "$schema": "https://json.schemastore.org/component-detection-manifest.json", | |||
There was a problem hiding this comment.
The whitespace changes here are annoying, but PowerShell doesn't let you control whitespace, and at least once this change is made, future runs of the tool will have minimal changes.
There was a problem hiding this comment.
Looks like this "broke" the Grammar tests (hey, that means they're running!) but they aren't showing up in the tests tab of AzDO. I THINK you can fix that by un-commenting https://github.com/dotnet/razor-tooling/blob/main/azure-pipelines.yml#L281-L288.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
oh.. its a whitespace issue, isn't it? 🤦♂️ |
...or/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json
Show resolved
Hide resolved
davidwengier
force-pushed
the
UpdateTmLanguageJson
branch
from
18e93f4 to
8a8898d
Compare
...Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/tests/__snapshots__/GrammarTests.test.ts.snap
Outdated
Show resolved
Hide resolved
| "patterns": [ | ||
| { | ||
| "include": "source.cs" | ||
| "include": "source.cs#class-or-struct-members" |
There was a problem hiding this comment.
This is the fix for the nullable issue, specifically telling TextMate that the contents of @code and @functions blocks are class members.
At least thats my intepretation of what this does :)
There was a problem hiding this comment.
That sounds plausible. The C# TextMate grammar allows for top-level statements, and I wonder if that's tripping us up.
|
Please re-review @ryanbrandenburg, and would love your review @DustinCampbell because I assume you both know more about this than me. As annoying as it is, reviewing the test snapshot file would be very helpful :) |
davidwengier
requested review from
DustinCampbell and
allisonchou
and removed request for
a team
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
| "patterns": [ | ||
| { | ||
| "include": "source.cs" | ||
| "include": "source.cs#class-or-struct-members" |
There was a problem hiding this comment.
That sounds plausible. The C# TextMate grammar allows for top-level statements, and I wonder if that's tripping us up.
| "version": "https://github.com/microsoft/vscode/tree/ecb3421521db4764becfd198a79ca88b6aad73c2" | ||
| } | ||
| ], | ||
| "version": 1 |
There was a problem hiding this comment.
Did you mean to change the formatting here so dramatically?
There was a problem hiding this comment.
Yes and no. No, in that Powershell wrote out the file like this, and I couldn't work out how to get it to stop, but yes, in that I don't think its a problem and at least future updates will be minimal.
There was a problem hiding this comment.
if it's ConvertTo-Json in powershell, I believe -Compress removes indentation/whitespace
There was a problem hiding this comment.
Yeah, but that makes it all one line, and even uglier IMO 😛
There was a problem hiding this comment.
ah, I haven't used it in a while. I tried 🤷
...or/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json
Show resolved
Hide resolved
| 113,1,HTML Tag Delimiter, | ||
| 124,1,HTML Tag Delimiter, | ||
| 125,7,RazorComponentElement, | ||
| 132,1,HTML Tag Delimiter, |
There was a problem hiding this comment.
Just when you think you might understand classification, along comes this change, which is apparently caused by the changes in this PR, but I am definitely not smart enought to work out why!
There was a problem hiding this comment.
Did you get to the bottom of this? That's definitely a problem.
There was a problem hiding this comment.
Not entirely.. the difference is that the whitespace before the /> is not classified as a tag delimeter any more, which seems completely fine to me, but I can't directly explain why it changed now. The html textmate files in this test project were not up to date with our real ones though 🤷♂️
There was a problem hiding this comment.
Oh! OK, it's just the whitespace. That's totally fine. I thought it was the />.
4 participants
Hopefully fixes #4472, though I'm not sure I know how to test that theory 😁