-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Use correct tm_scope for Unix Assembler #4167
Conversation
Shouldn't this have been detected by our tests? |
Yup, as has happened with me just changing the |
Hmmm, looks like the $ script/add-grammar --replace Assembly-Syntax-Definition https://github.com/calculuswhiz/Assembly-Syntax-Definition
Checking docker is installed and running
$ docker ps
Deregistering: vendor/grammars/Assembly-Syntax-Definition
$ git submodule deinit vendor/grammars/Assembly-Syntax-Definition
$ git rm -rf vendor/grammars/Assembly-Syntax-Definition
$ script/grammar-compiler update -f
Registering new submodule: vendor/grammars/Assembly-Syntax-Definition
$ git submodule add -f https://github.com/calculuswhiz/Assembly-Syntax-Definition vendor/grammars/Assembly-Syntax-Definition
$ script/grammar-compiler add vendor/grammars/Assembly-Syntax-Definition
Confirming license
$ script/licensed
Updating grammar documentation in vendor/README.md
$ bundle exec rake samples
$ script/sort-submodules
$ script/list-grammars
$
$ $ git diff grammars.yml colin@github.com
diff --git a/grammars.yml b/grammars.yml
index c68d4c22..306b764c 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -10,7 +10,7 @@ vendor/grammars/Agda.tmbundle:
vendor/grammars/Alloy.tmbundle:
- source.alloy
vendor/grammars/Assembly-Syntax-Definition:
-- source.assembly.unix
+- source.x86 <---- HERE
vendor/grammars/AutoHotkey:
- source.ahk
vendor/grammars/BrightScript.tmbundle:
[...] |
It should have been detected when it was set then, or are we missing a test? |
Been dabbing this morning and I think we're missing a test as manually setting this in both Will look into adding a test to ensure the correct value is set as part of this PR. |
Hmmm, seems harder to do than I thought. Might have to hold off on a test for this for the moment. |
Not gonna add a test for the mo. Ready for review. |
Description
As pointed out in #4163, GNU/Unix Assembler files are not being syntax highlighted.
@pchaigno spotted that this is because the
tm_scope
is incorrect. This PR corrects that.Checklist:
adding new or changing current functionalityfixing a bugFixes #4163