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.

Sign up for GitHub

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

Jump to bottom

Replace mcfunction grammar #6916

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace mcfunction grammar #6916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,6 @@
[submodule "vendor/grammars/language-maxscript"]
path = vendor/grammars/language-maxscript
url = https://github.com/Alhadis/language-maxscript
[submodule "vendor/grammars/language-mcfunction"]
path = vendor/grammars/language-mcfunction
url = https://github.com/Arcensoth/language-mcfunction
[submodule "vendor/grammars/language-mermaid"]
path = vendor/grammars/language-mermaid
url = https://github.com/Alhadis/language-mermaid.git
Expand Down Expand Up @@ -1196,6 +1193,9 @@
[submodule "vendor/grammars/syntax"]
path = vendor/grammars/syntax
url = https://github.com/hashicorp/syntax.git
[submodule "vendor/grammars/syntax-mcfunction"]
path = vendor/grammars/syntax-mcfunction
url = https://github.com/MinecraftCommands/syntax-mcfunction.git
[submodule "vendor/grammars/tcl.tmbundle"]
path = vendor/grammars/tcl.tmbundle
url = https://github.com/textmate/tcl.tmbundle
Expand Down
5 changes: 2 additions & 3 deletions grammars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,6 @@ vendor/grammars/language-macaulay2:
- source.m2
vendor/grammars/language-maxscript:
- source.maxscript
vendor/grammars/language-mcfunction:
- markdown.mcfunction.codeblock
- source.mcfunction
vendor/grammars/language-mermaid:
- source.mermaid
- source.mermaid.c4c-diagram
Expand Down Expand Up @@ -1070,6 +1067,8 @@ vendor/grammars/syntax:
- source.hcl
- source.hcl.terraform
- source.sentinel
vendor/grammars/syntax-mcfunction:
- source.mcfunction
vendor/grammars/tcl.tmbundle:
- source.tcl
- text.html.tcl
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **jq:** [wader/language-jq](https://github.com/wader/language-jq)
- **kvlang:** [p0lygun/kivy-language-grammer](https://github.com/p0lygun/kivy-language-grammer)
- **mIRC Script:** [gen-angry/language-msl](https://github.com/gen-angry/language-msl)
- **mcfunction:** [Arcensoth/language-mcfunction](https://github.com/Arcensoth/language-mcfunction)
- **mcfunction:** [MinecraftCommands/syntax-mcfunction](https://github.com/MinecraftCommands/syntax-mcfunction)
- **mupad:** [ccreutzig/sublime-MuPAD](https://github.com/ccreutzig/sublime-MuPAD)
- **nanorc:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
- **nesC:** [cdwilson/nesC.tmbundle](https://github.com/cdwilson/nesC.tmbundle)
Expand Down
1 change: 0 additions & 1 deletion vendor/grammars/language-mcfunction
Open in desktop
Submodule language-mcfunction deleted from d525d3
1 change: 1 addition & 0 deletions vendor/grammars/syntax-mcfunction
Open in desktop
Submodule syntax-mcfunction added at 458827
8 changes: 4 additions & 4 deletions ...git_submodule/language-mcfunction.dep.yml → ...s/git_submodule/syntax-mcfunction.dep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: language-mcfunction
version: d525d3b976869b093893c0cab2645455e12e2464
name: syntax-mcfunction
version: 458827b54015dd70dbc356574c964d22f02401a7
type: git_submodule
homepage: https://github.com/Arcensoth/language-mcfunction
homepage: https://github.com/MinecraftCommands/syntax-mcfunction.git
license: mit
licenses:
- sources: LICENSE
text: |
MIT License

Copyright (c) 2019-2020 Arcensoth
Copyright (c) 2023-2023 MinecraftCommands

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down