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

Puppet Support #6412

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Puppet Support #6412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f52eb49
Added puppet support
gautamprikshit1 Mar 23, 2023
45e6181
Added puppet support
gautamprikshit1 Mar 23, 2023
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
16 changes: 14 additions & 2 deletions languages.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Language support configuration.
# See the languages documentation: https://docs.helix-editor.com/master/languages.html
# Language support configuration. See the languages documentation: https://docs.helix-editor.com/master/languages.html

[[language]]
name = "rust"
Expand Down Expand Up @@ -2369,3 +2368,16 @@ language-server = { command = "cs", args = ["launch", "com.disneystreaming.smith
[[grammar]]
name = "smithy"
source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0" }

[[language]]
name = "puppet"
scope = "source.puppet"
injection-regex = "puppet"
file-types = ["puppet"]
roots = []
indent = { tab_width = 2, unit = " " }
comment-token = "#"
Comment on lines +2374 to +2379
Copy link
Contributor

@erasin erasin Mar 25, 2023 •
edited

Choose a reason for hiding this comment

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

file-types = ["pp"]
indent = { tab-width = 2, unit = " " }

there has tip: https://github.com/neovim-puppet/tree-sitter-puppet/tree/main/test/highlight

@jficz The file type here will conflict with pascal, can be overridden by custom languages.toml reconfiguration.

Copy link

@jficz jficz Mar 26, 2023 •
edited

Choose a reason for hiding this comment

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

I would actually argue that it is Pascal (or, specifically, FreePascal's need to be different) which is in conflict with Puppet here. Historically and practically, .pas is the recognized Pascal extension. .pp is just a vendor-specific variant which doesn't really have a rational reason to exist in the first place and therefore it should be the other way around, that is. .pp for (Free)Pascal files should be overridden by custom language.toml if needed.

Some high-profile Pascal IDEs and variants don't even recognize .pp as Pascal files as far as I know while for Puppet, .pp is universally recognized.


[[grammar]]
name = "puppet"
source = { git = "https://github.com/neovim-puppet/tree-sitter-puppet", rev = "bdedf4d5b13b4020745a678364e2f441cd3abf2a" }
68 changes: 68 additions & 0 deletions runtime/queries/puppet/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
(function) @function
(variable) @variable
[
(identifier)
] @identifier

[
"class"
"define"
"plan"
"node"
"type"
] @keyword

[
"contain"
"include"
"inherits"
"require"
] @include

[
"case"
"else"
"elsif"
"if"
"unless"
] @conditional

(string) @string
(regex) @regex
(integer) @number
(float) @float
(regex) @string.regex
(comment) @comment
[(true) (false)] @boolean

(unprotected_string) @text

[
(chaining_arrow)
(operator)
] @operator


(interpolation
"${" @punctuation.special
"}" @punctuation.special) @none

Comment on lines +1 to +49
Copy link
Member

Choose a reason for hiding this comment

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

Please follow https://docs.helix-editor.com/themes.html#syntax-highlighting

[
"("
")"
"["
"]"
"{"
"}"
]@punctuation.bracket

[
","
":"
"::"
] @punctuation.delimiter

[(type) (type_identifier)] @type

(escape_sequence) @escape