mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-01 19:17:02 -04:00
feat(injections): add printf format strings
This commit is contained in:
parent
2160b26453
commit
947c43052c
14 changed files with 184 additions and 20 deletions
|
|
@ -153,6 +153,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` | | | @steelsojka
|
|||
[po](https://github.com/erasin/tree-sitter-po) | core | `HF J ` | | | @amaanq
|
||||
[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unsupported | `HFIJ ` | | | @ObserverOfTime
|
||||
[pony](https://github.com/amaanq/tree-sitter-pony) | core | `HFIJL` | | | @amaanq, @mfelsche
|
||||
[printf](https://github.com/ObserverOfTime/tree-sitter-printf)[^printf] | core | `H ` | | | @ObserverOfTime
|
||||
[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `H ` | | | @elianiva
|
||||
[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unsupported | `H J ` | | | @MichaHoffmann
|
||||
[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF ` | | | @treywood
|
||||
|
|
@ -241,6 +242,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` | | | @steelsojka
|
|||
[^markdown]: basic highlighting
|
||||
[^markdown_inline]: needed for full highlighting
|
||||
[^poe_filter]: Path of Exile item filter
|
||||
[^printf]: printf format strings
|
||||
[^query]: Tree-sitter query language
|
||||
[^uxntal]: uxn tal
|
||||
<!--parserinfo-->
|
||||
|
|
|
|||
|
|
@ -413,6 +413,9 @@
|
|||
"pony": {
|
||||
"revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
|
||||
},
|
||||
"printf": {
|
||||
"revision": "8a3f07c1f620ae46d14873e5b7ee0d3e114c15e8"
|
||||
},
|
||||
"prisma": {
|
||||
"revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1314,6 +1314,16 @@ M.configs = {
|
|||
tier = 2,
|
||||
},
|
||||
|
||||
printf = {
|
||||
install_info = {
|
||||
url = 'https://github.com/ObserverOfTime/tree-sitter-printf',
|
||||
files = { 'src/parser.c' },
|
||||
},
|
||||
maintainers = { '@ObserverOfTime' },
|
||||
readme_note = 'printf format strings',
|
||||
tier = 2,
|
||||
},
|
||||
|
||||
prisma = {
|
||||
install_info = {
|
||||
url = 'https://github.com/victorhqc/tree-sitter-prisma',
|
||||
|
|
|
|||
|
|
@ -3,3 +3,11 @@
|
|||
|
||||
((regex) @injection.content
|
||||
(#set! injection.language "regex"))
|
||||
|
||||
((print_statement
|
||||
(exp_list . (string) @injection.content))
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((printf_statement
|
||||
(exp_list . (string) @injection.content))
|
||||
(#set! injection.language "printf"))
|
||||
|
|
|
|||
|
|
@ -8,3 +8,28 @@
|
|||
(heredoc_body) @injection.content
|
||||
(heredoc_end) @injection.language)
|
||||
(#downcase! @injection.language))
|
||||
|
||||
; printf 'format'
|
||||
((command
|
||||
name: (command_name) @_command
|
||||
. argument: [(string) (raw_string)] @injection.content)
|
||||
(#eq? @_command "printf")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
; printf -v var 'format'
|
||||
((command
|
||||
name: (command_name) @_command
|
||||
argument: (word) @_arg
|
||||
. (_) . argument: [(string) (raw_string)] @injection.content)
|
||||
(#eq? @_command "printf")
|
||||
(#eq? @_arg "-v")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
; printf -- 'format'
|
||||
((command
|
||||
name: (command_name) @_command
|
||||
argument: (word) @_arg
|
||||
. argument: [(string) (raw_string)] @injection.content)
|
||||
(#eq? @_command "printf")
|
||||
(#eq? @_arg "--")
|
||||
(#set! injection.language "printf"))
|
||||
|
|
|
|||
|
|
@ -12,6 +12,73 @@
|
|||
(#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
|
||||
(#set! injection.language "doxygen"))
|
||||
|
||||
((call_expression
|
||||
function: (identifier) @_function
|
||||
arguments: (argument_list
|
||||
. (string_literal (string_content) @injection.content)))
|
||||
(#any-of? @_function "printf" "printf_s"
|
||||
"vprintf" "vprintf_s"
|
||||
"scanf" "scanf_s"
|
||||
"vscanf" "vscanf_s"
|
||||
"wprintf" "wprintf_s"
|
||||
"vwprintf" "vwprintf_s"
|
||||
"wscanf" "wscanf_s"
|
||||
"vwscanf" "vwscanf_s"
|
||||
"cscanf" "_cscanf"
|
||||
"printw"
|
||||
"scanw")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((call_expression
|
||||
function: (identifier) @_function
|
||||
arguments: (argument_list
|
||||
(_) . (string_literal (string_content) @injection.content)))
|
||||
(#any-of? @_function "fprintf" "fprintf_s"
|
||||
"sprintf"
|
||||
"dprintf"
|
||||
"fscanf" "fscanf_s"
|
||||
"sscanf" "sscanf_s"
|
||||
"vsscanf" "vsscanf_s"
|
||||
"vfprintf" "vfprintf_s"
|
||||
"vsprintf"
|
||||
"vdprintf"
|
||||
"fwprintf" "fwprintf_s"
|
||||
"vfwprintf" "vfwprintf_s"
|
||||
"fwscanf" "fwscanf_s"
|
||||
"swscanf" "swscanf_s"
|
||||
"vswscanf" "vswscanf_s"
|
||||
"vfscanf" "vfscanf_s"
|
||||
"vfwscanf" "vfwscanf_s"
|
||||
"wprintw"
|
||||
"vw_printw" "vwprintw"
|
||||
"wscanw"
|
||||
"vw_scanw" "vwscanw")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((call_expression
|
||||
function: (identifier) @_function
|
||||
arguments: (argument_list
|
||||
(_) . (_) . (string_literal (string_content) @injection.content)))
|
||||
(#any-of? @_function "sprintf_s"
|
||||
"snprintf" "snprintf_s"
|
||||
"vsprintf_s"
|
||||
"vsnprintf" "vsnprintf_s"
|
||||
"swprintf" "swprintf_s"
|
||||
"snwprintf_s"
|
||||
"vswprintf" "vswprintf_s"
|
||||
"vsnwprintf_s"
|
||||
"mvprintw"
|
||||
"mvscanw")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((call_expression
|
||||
function: (identifier) @_function
|
||||
arguments: (argument_list
|
||||
(_) . (_) . (_) . (string_literal (string_content) @injection.content)))
|
||||
(#any-of? @_function "mvwprintw"
|
||||
"mvwscanw")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
; TODO: add when asm is added
|
||||
; (gnu_asm_expression assembly_code: (string_literal) @injection.content
|
||||
; (#set! injection.language "asm"))
|
||||
|
|
|
|||
|
|
@ -19,6 +19,20 @@
|
|||
(#offset! @injection.content 0 1 0 -1)
|
||||
(#set! injection.language "regex")))
|
||||
|
||||
|
||||
((comment) @injection.content
|
||||
(#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
|
||||
(#set! injection.language "re2c"))
|
||||
|
||||
((call_expression
|
||||
function: (selector_expression field: (field_identifier) @_method)
|
||||
arguments: (argument_list . (interpreted_string_literal) @injection.content))
|
||||
(#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((call_expression
|
||||
function: (selector_expression field: (field_identifier) @_method)
|
||||
arguments: (argument_list (_) . (interpreted_string_literal) @injection.content))
|
||||
(#eq? @_method "Fprintf")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
|
|
|
|||
|
|
@ -7,3 +7,10 @@
|
|||
((block_comment) @injection.content
|
||||
(#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
|
||||
(#set! injection.language "doxygen"))
|
||||
|
||||
((method_invocation
|
||||
name: (identifier) @_method
|
||||
arguments: (argument_list
|
||||
. (string_literal . (_) @injection.content)))
|
||||
(#any-of? @_method "format" "printf")
|
||||
(#set! injection.language "printf"))
|
||||
|
|
|
|||
|
|
@ -34,3 +34,11 @@
|
|||
(value_arguments
|
||||
(value_argument
|
||||
(string_literal) @injection.content (#set! injection.language "regex")))))
|
||||
|
||||
; "pi = %.2f".format(3.14159)
|
||||
((call_expression
|
||||
(navigation_expression
|
||||
(string_literal) @injection.content
|
||||
(navigation_suffix (simple_identifier) @_method)))
|
||||
(#eq? @_method "format")
|
||||
(#set! injection.language "printf"))
|
||||
|
|
|
|||
|
|
@ -87,6 +87,23 @@
|
|||
(#set! injection.language "luap")
|
||||
(#set! injection.include-children))))
|
||||
|
||||
; string.format("pi = %.2f", 3.14159)
|
||||
((function_call
|
||||
(dot_index_expression
|
||||
field: (identifier) @_method)
|
||||
arguments: (arguments
|
||||
. (string (string_content) @injection.content)))
|
||||
(#eq? @_method "format")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
; ("pi = %.2f"):format(3.14159)
|
||||
((function_call
|
||||
(method_index_expression
|
||||
table: (_ (string (string_content) @injection.content))
|
||||
method: (identifier) @_method))
|
||||
(#eq? @_method "format")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((comment) @injection.content
|
||||
(#set! injection.language "comment")
|
||||
(#set! injection.include-children))
|
||||
|
|
|
|||
1
runtime/queries/printf/highlights.scm
Normal file
1
runtime/queries/printf/highlights.scm
Normal file
|
|
@ -0,0 +1 @@
|
|||
(format) @character
|
||||
|
|
@ -7,5 +7,10 @@
|
|||
(#lua-match? @_string "^r.*")
|
||||
(#set! injection.language "regex"))
|
||||
|
||||
((binary_operator
|
||||
left: (string (string_content) @injection.content)
|
||||
operator: "%")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((comment) @injection.content
|
||||
(#set! injection.language "comment"))
|
||||
|
|
|
|||
|
|
@ -112,24 +112,4 @@
|
|||
. ">" @punctuation.bracket)))
|
||||
[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
|
||||
|
||||
;; Only highlight format specifiers in calls to string.format
|
||||
;; string.format('...')
|
||||
;(function_call
|
||||
; called_object: (index
|
||||
; (identifier) @base
|
||||
; key: (identifier) @entry)
|
||||
; arguments: (arguments .
|
||||
; (string (format_specifier) @string.escape))
|
||||
;
|
||||
; (#eq? @base "string")
|
||||
; (#eq? @entry "format"))
|
||||
|
||||
;; ('...'):format()
|
||||
;(function_call
|
||||
; called_object: (method_index
|
||||
; (string (format_specifier) @string.escape)
|
||||
; key: (identifier) @func-name)
|
||||
; (#eq? @func-name "format"))
|
||||
|
||||
|
||||
(ERROR) @error
|
||||
|
|
|
|||
|
|
@ -26,5 +26,22 @@
|
|||
(#set! injection.language "c")
|
||||
)
|
||||
|
||||
; string.format('...')
|
||||
((function_call
|
||||
(index
|
||||
(identifier) @_base
|
||||
key: (identifier) @_entry)
|
||||
(arguments . (string) @injection.content))
|
||||
(#eq? @_base "string")
|
||||
(#eq? @_entry "format")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
; ('...'):format()
|
||||
((function_call
|
||||
(method_index (string) @printf
|
||||
key: (identifier) @_func))
|
||||
(#eq? @_func "format")
|
||||
(#set! injection.language "printf"))
|
||||
|
||||
((comment) @injection.content
|
||||
(#set! injection.language "comment"))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue