From 0277516eef8763ccf15f9c1963c5390b4a13a4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Sun, 31 Aug 2025 13:47:53 +0200 Subject: [PATCH 1/4] Revert "syntax: Remove empty rules in regions" This reverts commit a9b513a28adaaa7782505dc1e284e1a0132cb66f. --- runtime/syntax/caddyfile.yaml | 1 + runtime/syntax/cmake.yaml | 1 + runtime/syntax/crystal.yaml | 3 +++ runtime/syntax/css.yaml | 2 ++ runtime/syntax/d.yaml | 3 +++ runtime/syntax/erb.yaml | 2 ++ runtime/syntax/erlang.yaml | 2 ++ runtime/syntax/fish.yaml | 1 + runtime/syntax/forth.yaml | 1 + runtime/syntax/fsharp.yaml | 1 + runtime/syntax/gemini.yaml | 1 + runtime/syntax/gentoo-etc-portage.yaml | 1 + runtime/syntax/git-commit.yaml | 1 + runtime/syntax/git-config.yaml | 1 + runtime/syntax/git-rebase-todo.yaml | 1 + runtime/syntax/go.yaml | 1 + runtime/syntax/graphql.yaml | 1 + runtime/syntax/groff.yaml | 3 +++ runtime/syntax/groovy.yaml | 3 +++ runtime/syntax/html4.yaml | 1 + runtime/syntax/html5.yaml | 1 + runtime/syntax/java.yaml | 2 ++ runtime/syntax/jinja2.yaml | 1 + runtime/syntax/jsonnet.yaml | 1 + runtime/syntax/julia.yaml | 4 ++++ runtime/syntax/justfile.yaml | 1 + runtime/syntax/keymap.yaml | 1 + runtime/syntax/kvlang.yaml | 3 +++ runtime/syntax/lilypond.yaml | 2 ++ runtime/syntax/log.yaml | 1 + runtime/syntax/lua.yaml | 5 +++++ runtime/syntax/mail.yaml | 2 ++ runtime/syntax/makefile.yaml | 1 + runtime/syntax/markdown.yaml | 1 + runtime/syntax/mc.yaml | 3 +++ runtime/syntax/nginx.yaml | 1 + runtime/syntax/nim.yaml | 1 + runtime/syntax/nix.yaml | 4 ++++ runtime/syntax/nu.yaml | 1 + runtime/syntax/ocaml.yaml | 1 + runtime/syntax/odin.yaml | 1 + runtime/syntax/pascal.yaml | 5 +++++ runtime/syntax/perl.yaml | 5 +++++ runtime/syntax/php.yaml | 2 ++ runtime/syntax/pony.yaml | 2 ++ runtime/syntax/pov.yaml | 1 + runtime/syntax/python2.yaml | 3 +++ runtime/syntax/python3.yaml | 2 ++ runtime/syntax/raku.yaml | 3 +++ runtime/syntax/rpmspec.yaml | 3 +++ runtime/syntax/ruby.yaml | 2 ++ runtime/syntax/rust.yaml | 6 ++++++ runtime/syntax/sage.yaml | 3 +++ runtime/syntax/scad.yaml | 1 + runtime/syntax/scala.yaml | 4 ++++ runtime/syntax/sh.yaml | 3 +++ runtime/syntax/smalltalk.yaml | 2 ++ runtime/syntax/solidity.yaml | 2 ++ runtime/syntax/stata.yaml | 3 +++ runtime/syntax/tex.yaml | 4 ++++ runtime/syntax/toml.yaml | 2 ++ runtime/syntax/twig.yaml | 1 + runtime/syntax/typescript.yaml | 1 + runtime/syntax/v.yaml | 1 + runtime/syntax/vala.yaml | 1 + runtime/syntax/vi.yaml | 1 + runtime/syntax/vue.yaml | 1 + runtime/syntax/xml.yaml | 3 +++ runtime/syntax/zsh.yaml | 2 ++ 69 files changed, 138 insertions(+) diff --git a/runtime/syntax/caddyfile.yaml b/runtime/syntax/caddyfile.yaml index 3e5feffb..cb218212 100644 --- a/runtime/syntax/caddyfile.yaml +++ b/runtime/syntax/caddyfile.yaml @@ -19,4 +19,5 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/cmake.yaml b/runtime/syntax/cmake.yaml index 291f4462..d23e613d 100644 --- a/runtime/syntax/cmake.yaml +++ b/runtime/syntax/cmake.yaml @@ -30,6 +30,7 @@ rules: - preproc: start: "\\$(\\{|ENV\\{)" end: "\\}" + rules: [] - identifier.macro: "\\b(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\\b" diff --git a/runtime/syntax/crystal.yaml b/runtime/syntax/crystal.yaml index 0496d7f7..896864ff 100644 --- a/runtime/syntax/crystal.yaml +++ b/runtime/syntax/crystal.yaml @@ -27,10 +27,12 @@ rules: - constant.string: start: "`" end: "`" + rules: [] - constant.string: start: "%x\\{" end: "\\}" + rules: [] - constant.string: start: "\"" @@ -66,4 +68,5 @@ rules: - constant: start: "<<-?'?EOT'?" end: "^EOT" + rules: [] diff --git a/runtime/syntax/css.yaml b/runtime/syntax/css.yaml index c86e6d6f..e1acbe2a 100644 --- a/runtime/syntax/css.yaml +++ b/runtime/syntax/css.yaml @@ -9,11 +9,13 @@ rules: # - normal: # start: "\\{" # end: "\\}" + # rules: [] # css commands - type: "(align-content|align-items|alignment-baseline|align-self|all|animation|animation-delay|animation-direction|animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|appearance|azimuth|backdrop-filter|backface-visibility|background|background-attachment|background-blend-mode|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|baseline-shift|bookmark-label|bookmark-level|bookmark-state|border|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-boundary|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-decoration-break|box-shadow|box-sizing|box-snap|box-suppress|break-after|break-before|break-inside|caption-side|caret|caret-animation|caret-color|caret-shape|chains|clear|clip|clip-path|clip-rule|color|color-interpolation-filters|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|columns|column-span|column-width|content|continue|counter-increment|counter-reset|counter-set|cue|cue-after|cue-before|cursor|direction|display|dominant-baseline|elevation|empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float|float-defer|float-offset|float-reference|flood-color|flood-opacity|flow|flow-from|flow-into|font|font-family|font-feature-settings|font-kerning|font-language-override|font-size|font-size-adjust|font-stretch|font-style|font-synthesis|font-variant|font-variant-alternates|font-variant-caps|font-variant-east-asian|font-variant-ligatures|font-variant-numeric|font-variant-position|font-weight|footnote-display|footnote-policy|gap|glyph-orientation-vertical|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-gap|grid-column-start|grid-gap|grid-row|grid-row-end|grid-row-gap|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|hanging-punctuation|height|hyphenate-character|hyphenate-limit-chars|hyphenate-limit-last|hyphenate-limit-lines|hyphenate-limit-zone|hyphens|image-orientation|image-rendering|image-resolution|initial-letter|initial-letter-align|initial-letter-wrap|isolation|justify-content|justify-items|justify-self|left|letter-spacing|lighting-color|line-break|line-grid|line-height|line-snap|list-style|list-style-image|list-style-position|list-style-type|margin|margin-bottom|margin-left|margin-right|margin-top|marker|marker-end|marker-knockout-left|marker-knockout-right|marker-mid|marker-pattern|marker-segment|marker-side|marker-start|marquee-direction|marquee-loop|marquee-speed|marquee-style|mask|mask-border|mask-border-mode|mask-border-outset|mask-border-repeat|mask-border-slice|mask-border-source|mask-border-width|mask-clip|mask-composite|mask-image|mask-mode|mask-origin|mask-position|mask-repeat|mask-size|mask-type|max-height|max-lines|max-width|min-height|min-width|mix-blend-mode|motion|motion-offset|motion-path|motion-rotation|nav-down|nav-left|nav-right|nav-up|object-fit|object-position|offset-after|offset-before|offset-end|offset-start|opacity|order|orphans|outline|outline-color|outline-offset|outline-style|outline-width|overflow|overflow-style|overflow-wrap|overflow-x|overflow-y|padding|padding-bottom|padding-left|padding-right|padding-top|page|page-break-after|page-break-before|page-break-inside|pause|pause-after|pause-before|perspective|perspective-origin|pitch|pitch-range|play-during|pointer-events|polar-anchor|polar-angle|polar-distance|polar-origin|position|presentation-level|quotes|region-fragment|resize|rest|rest-after|rest-before|richness|right|rotation|rotation-point|ruby-align|ruby-merge|ruby-position|running|scrollbar-color|scroll-behavior|scroll-snap-align|scroll-snap-margin|scroll-snap-margin-block|scroll-snap-margin-block-end|scroll-snap-margin-block-start|scroll-snap-margin-bottom|scroll-snap-margin-inline|scroll-snap-margin-inline-end|scroll-snap-margin-inline-start|scroll-snap-margin-left|scroll-snap-margin-right|scroll-snap-margin-top|scroll-snap-padding|scroll-snap-padding-block|scroll-snap-padding-block-end|scroll-snap-padding-block-start|scroll-snap-padding-bottom|scroll-snap-padding-inline|scroll-snap-padding-inline-end|scroll-snap-padding-inline-start|scroll-snap-padding-left|scroll-snap-padding-right|scroll-snap-padding-top|scroll-snap-type|shape-image-threshold|shape-inside|shape-margin|shape-outside|size|speak|speak-as|speak-header|speak-numeral|speak-punctuation|speech-rate|stress|string-set|stroke|stroke-alignment|stroke-dashadjust|stroke-dasharray|stroke-dashcorner|stroke-dashoffset|stroke-linecap|stroke-linejoin|stroke-miterlimit|stroke-opacity|stroke-width|table-layout|tab-size|text-align|text-align-all|text-align-last|text-combine-upright|text-decoration|text-decoration-color|text-decoration-line|text-decoration-skip|text-decoration-style|text-emphasis|text-emphasis-color|text-emphasis-position|text-emphasis-style|text-indent|text-justify|text-orientation|text-overflow|text-shadow|text-space-collapse|text-space-trim|text-spacing|text-transform|text-underline-offset|text-underline-position|text-wrap|top|transform|transform-box|transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property|transition-timing-function|unicode-bidi|user-select|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch|voice-range|voice-rate|voice-stress|voice-volume|volume|white-space|widows|width|will-change|word-break|word-spacing|word-wrap|wrap-after|wrap-before|wrap-flow|wrap-inside|wrap-through|writing-mode|z-index):" # - default: # start: ":" # end: "[;^\\{]" + # rules: [] - special: "!important" - identifier: ":active|:focus|:hover|:link|:visited|:link|:after|:before|$" - special: "(\\{|\\}|\\(|\\)|\\;|:|\\]|~|<|>|,)" diff --git a/runtime/syntax/d.yaml b/runtime/syntax/d.yaml index 06f474cc..e8d36e28 100644 --- a/runtime/syntax/d.yaml +++ b/runtime/syntax/d.yaml @@ -109,10 +109,13 @@ rules: - comment: start: "//" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] - comment: start: "/\\+" end: "\\+/" + rules: [] diff --git a/runtime/syntax/erb.yaml b/runtime/syntax/erb.yaml index ca14c545..fbe420b1 100644 --- a/runtime/syntax/erb.yaml +++ b/runtime/syntax/erb.yaml @@ -19,6 +19,7 @@ rules: - default: start: "<%" end: "%>" + rules: [] - preproc: "<%|%>" - red: "&[^;[[:space:]]]*;" @@ -36,5 +37,6 @@ rules: - identifier.macro: start: "<<-?'?EOT'?" end: "^EOT" + rules: [] - todo: "(XXX|TODO|FIXME|\\?\\?\\?)" diff --git a/runtime/syntax/erlang.yaml b/runtime/syntax/erlang.yaml index 3fe7ebdd..f4ef19d4 100644 --- a/runtime/syntax/erlang.yaml +++ b/runtime/syntax/erlang.yaml @@ -22,6 +22,7 @@ rules: start: "'" end: "'" skip: "\\\\." + rules: [] # - constant.specialChar: "%." # - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]" # - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})" @@ -41,3 +42,4 @@ rules: - comment: start: "%" end: "$" + rules: [] diff --git a/runtime/syntax/fish.yaml b/runtime/syntax/fish.yaml index 63fc473c..73da2268 100644 --- a/runtime/syntax/fish.yaml +++ b/runtime/syntax/fish.yaml @@ -38,6 +38,7 @@ rules: start: "'" end: "'" skip: "\\\\." + rules: [] - comment: start: "#" diff --git a/runtime/syntax/forth.yaml b/runtime/syntax/forth.yaml index f7459917..44ca1a31 100644 --- a/runtime/syntax/forth.yaml +++ b/runtime/syntax/forth.yaml @@ -19,6 +19,7 @@ rules: - constant.string: start: "\\b([Ss.]\" )" end: "\"" + rules: [] - comment: start: "\\(" diff --git a/runtime/syntax/fsharp.yaml b/runtime/syntax/fsharp.yaml index bf03d4a6..bf586334 100644 --- a/runtime/syntax/fsharp.yaml +++ b/runtime/syntax/fsharp.yaml @@ -45,3 +45,4 @@ rules: - comment: start: "\\(\\*" end: "\\*\\)" + rules: [] diff --git a/runtime/syntax/gemini.yaml b/runtime/syntax/gemini.yaml index 69a089f9..b3ea7bf1 100644 --- a/runtime/syntax/gemini.yaml +++ b/runtime/syntax/gemini.yaml @@ -10,6 +10,7 @@ rules: - special: start: "^```" end: "^```" + rules: [] # heading lines - special: "^#{1,3}.*" # unordered list items diff --git a/runtime/syntax/gentoo-etc-portage.yaml b/runtime/syntax/gentoo-etc-portage.yaml index 72144c7f..300687e6 100644 --- a/runtime/syntax/gentoo-etc-portage.yaml +++ b/runtime/syntax/gentoo-etc-portage.yaml @@ -20,3 +20,4 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/git-commit.yaml b/runtime/syntax/git-commit.yaml index de4425a0..68032e1f 100644 --- a/runtime/syntax/git-commit.yaml +++ b/runtime/syntax/git-commit.yaml @@ -22,6 +22,7 @@ rules: - comment.line: start: "^#" end: "$" + rules: [] # Diffs (i.e. git commit --verbose) - default: diff --git a/runtime/syntax/git-config.yaml b/runtime/syntax/git-config.yaml index ab6f14ad..a0f21e8d 100644 --- a/runtime/syntax/git-config.yaml +++ b/runtime/syntax/git-config.yaml @@ -11,3 +11,4 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/git-rebase-todo.yaml b/runtime/syntax/git-rebase-todo.yaml index 293fffad..724f9c9c 100644 --- a/runtime/syntax/git-rebase-todo.yaml +++ b/runtime/syntax/git-rebase-todo.yaml @@ -16,3 +16,4 @@ rules: - comment.line: start: "^#" end: "$" + rules: [] diff --git a/runtime/syntax/go.yaml b/runtime/syntax/go.yaml index f349bab5..3885c7b1 100644 --- a/runtime/syntax/go.yaml +++ b/runtime/syntax/go.yaml @@ -47,6 +47,7 @@ rules: - constant.string: start: "`" end: "`" + rules: [] - comment: start: "//" diff --git a/runtime/syntax/graphql.yaml b/runtime/syntax/graphql.yaml index fa885738..d96abec3 100644 --- a/runtime/syntax/graphql.yaml +++ b/runtime/syntax/graphql.yaml @@ -44,3 +44,4 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/groff.yaml b/runtime/syntax/groff.yaml index 822f127b..3eaea1f9 100644 --- a/runtime/syntax/groff.yaml +++ b/runtime/syntax/groff.yaml @@ -11,6 +11,7 @@ rules: - constant: start: "(\\\\|\\\\\\\\)n\\[" end: "]" + rules: [] - type: "^\\.[[:space:]]*[^[[:space:]]]*" - comment: "^\\.\\\\\".*$" @@ -18,10 +19,12 @@ rules: - constant.string: start: "(\\\\|\\\\\\\\)\\*\\[" end: "]" + rules: [] - constant.specialChar: "\\\\\\(.." - constant.specialChar: start: "\\\\\\[" end: "]" + rules: [] - identifier.macro: "\\\\\\\\\\$[1-9]" diff --git a/runtime/syntax/groovy.yaml b/runtime/syntax/groovy.yaml index b610bc72..3aa0e283 100644 --- a/runtime/syntax/groovy.yaml +++ b/runtime/syntax/groovy.yaml @@ -75,6 +75,7 @@ rules: - identifier: start: "[$][{]" end: "[}]" + rules: [] # Triple-single-quoted strings - constant.string: @@ -89,6 +90,7 @@ rules: - constant.string: start: "[$]/" end: "/[$]" + rules: [] # Single-line comments - comment: @@ -108,3 +110,4 @@ rules: - comment: start: "/[*][*]@?" end: "[*]/" + rules: [] diff --git a/runtime/syntax/html4.yaml b/runtime/syntax/html4.yaml index 63fa7841..c132d61e 100644 --- a/runtime/syntax/html4.yaml +++ b/runtime/syntax/html4.yaml @@ -17,6 +17,7 @@ rules: - default: start: ">" end: "<" + rules: [] - symbol.tag: "<|>" - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+" diff --git a/runtime/syntax/html5.yaml b/runtime/syntax/html5.yaml index ca0d6b1f..411d5385 100644 --- a/runtime/syntax/html5.yaml +++ b/runtime/syntax/html5.yaml @@ -17,6 +17,7 @@ rules: - default: start: ">" end: "<" + rules: [] - symbol.tag: "<|>" - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ ]+" diff --git a/runtime/syntax/java.yaml b/runtime/syntax/java.yaml index 411dd000..8d298b93 100644 --- a/runtime/syntax/java.yaml +++ b/runtime/syntax/java.yaml @@ -28,8 +28,10 @@ rules: - comment: start: "//" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] diff --git a/runtime/syntax/jinja2.yaml b/runtime/syntax/jinja2.yaml index 229c6736..5579ccd8 100644 --- a/runtime/syntax/jinja2.yaml +++ b/runtime/syntax/jinja2.yaml @@ -16,3 +16,4 @@ rules: - comment: start: "{#" end: "#}" + rules: [] diff --git a/runtime/syntax/jsonnet.yaml b/runtime/syntax/jsonnet.yaml index afaf170c..928b78dc 100644 --- a/runtime/syntax/jsonnet.yaml +++ b/runtime/syntax/jsonnet.yaml @@ -75,6 +75,7 @@ rules: start: "\\|\\|\\| *$" end: "^ *\\|\\|\\|" + rules: [] # multi-line comment - comment: diff --git a/runtime/syntax/julia.yaml b/runtime/syntax/julia.yaml index 280eafb8..6555032b 100644 --- a/runtime/syntax/julia.yaml +++ b/runtime/syntax/julia.yaml @@ -30,6 +30,7 @@ rules: - constant.string: start: "\"\"\"" end: "\"\"\"" + rules: [] - constant.string: start: "\"" @@ -43,11 +44,14 @@ rules: - constant.string: start: "'\"" end: "'" + rules: [] - comment: start: "#=" end: "=#" + rules: [] - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/justfile.yaml b/runtime/syntax/justfile.yaml index 019d6f19..926edb21 100644 --- a/runtime/syntax/justfile.yaml +++ b/runtime/syntax/justfile.yaml @@ -37,3 +37,4 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/keymap.yaml b/runtime/syntax/keymap.yaml index bec0905f..317a1eea 100644 --- a/runtime/syntax/keymap.yaml +++ b/runtime/syntax/keymap.yaml @@ -23,4 +23,5 @@ rules: - comment: start: "^!" end: "$" + rules: [] diff --git a/runtime/syntax/kvlang.yaml b/runtime/syntax/kvlang.yaml index e9ccddf0..e40d348f 100644 --- a/runtime/syntax/kvlang.yaml +++ b/runtime/syntax/kvlang.yaml @@ -54,11 +54,14 @@ rules: start: "\"" end: "(\"|$)" skip: "\\\\." + rules: [] - constant.string: start: "'" end: "('|$)" skip: "\\\\." + rules: [] - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/lilypond.yaml b/runtime/syntax/lilypond.yaml index af178fb3..8023091e 100644 --- a/runtime/syntax/lilypond.yaml +++ b/runtime/syntax/lilypond.yaml @@ -18,7 +18,9 @@ rules: - comment: start: "%\\{" end: "%\\}" + rules: [] - comment: start: "%" end: "$" + rules: [] diff --git a/runtime/syntax/log.yaml b/runtime/syntax/log.yaml index c81f3032..34ef765d 100644 --- a/runtime/syntax/log.yaml +++ b/runtime/syntax/log.yaml @@ -83,6 +83,7 @@ rules: - constant.string.url: start: "https?://" end: "\\s" + rules: [] # path # - constant.string.url: "\\b(.+)/([^/]+)\\b" # linux diff --git a/runtime/syntax/lua.yaml b/runtime/syntax/lua.yaml index 279f78ec..ddf0d051 100644 --- a/runtime/syntax/lua.yaml +++ b/runtime/syntax/lua.yaml @@ -45,6 +45,7 @@ rules: - constant.string: start: "\\[\\[" end: "\\]\\]" + rules: [] # support first few lengths of "long brackets" explicitly # brackets longer than that will give false positives @@ -52,18 +53,22 @@ rules: - constant.string: start: "\\[=\\[" end: "\\]=\\]" + rules: [] - constant.string: start: "\\[==\\[" end: "\\]==\\]" + rules: [] - constant.string: start: "\\[===\\[" end: "\\]===\\]" + rules: [] - constant.string: start: "\\[====+\\[" end: "\\]====+\\]" + rules: [] - comment.block: start: "\\-\\-\\[\\[" diff --git a/runtime/syntax/mail.yaml b/runtime/syntax/mail.yaml index 4154e672..6ffe8733 100644 --- a/runtime/syntax/mail.yaml +++ b/runtime/syntax/mail.yaml @@ -18,6 +18,8 @@ rules: - default: start: "^\\n\\n" end: ".*" + rules: [] - comment: start: "^>.*" end: "$" + rules: [] diff --git a/runtime/syntax/makefile.yaml b/runtime/syntax/makefile.yaml index 1ad7094e..7e90cdeb 100644 --- a/runtime/syntax/makefile.yaml +++ b/runtime/syntax/makefile.yaml @@ -34,4 +34,5 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/markdown.yaml b/runtime/syntax/markdown.yaml index 32c79cf7..7ea4326c 100644 --- a/runtime/syntax/markdown.yaml +++ b/runtime/syntax/markdown.yaml @@ -46,3 +46,4 @@ rules: - special: start: "`" end: "`" + rules: [] diff --git a/runtime/syntax/mc.yaml b/runtime/syntax/mc.yaml index bb9f6b64..bcf11777 100644 --- a/runtime/syntax/mc.yaml +++ b/runtime/syntax/mc.yaml @@ -11,10 +11,13 @@ rules: - comment: start: "#" end: "$" + rules: [] - comment: start: "dnl" end: "$" + rules: [] - constant.string: start: "`" end: "'" + rules: [] diff --git a/runtime/syntax/nginx.yaml b/runtime/syntax/nginx.yaml index 8031416b..02ea6eb0 100644 --- a/runtime/syntax/nginx.yaml +++ b/runtime/syntax/nginx.yaml @@ -15,6 +15,7 @@ rules: - constant.string: start: "'$" end: "';$" + rules: [] - comment: "(^|[[:space:]])#([^{].*)?$" - indent-char.whitespace: "[[:space:]]+$" diff --git a/runtime/syntax/nim.yaml b/runtime/syntax/nim.yaml index 534bb238..45f73d17 100644 --- a/runtime/syntax/nim.yaml +++ b/runtime/syntax/nim.yaml @@ -22,5 +22,6 @@ rules: - comment: start: "\\#\\[" end: "\\]\\#" + rules: [] - todo: "(TODO|FIXME|XXX):?" diff --git a/runtime/syntax/nix.yaml b/runtime/syntax/nix.yaml index 1c621f3e..a60780a4 100644 --- a/runtime/syntax/nix.yaml +++ b/runtime/syntax/nix.yaml @@ -14,15 +14,19 @@ rules: - constant.string: start: "\"" end: "\"" + rules: [] - constant.string: start: "''" end: "''" + rules: [] - comment: start: "#" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] diff --git a/runtime/syntax/nu.yaml b/runtime/syntax/nu.yaml index a8539643..827f70ed 100644 --- a/runtime/syntax/nu.yaml +++ b/runtime/syntax/nu.yaml @@ -94,6 +94,7 @@ rules: - comment: start: "#" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" diff --git a/runtime/syntax/ocaml.yaml b/runtime/syntax/ocaml.yaml index 65cf37c8..d7915e54 100644 --- a/runtime/syntax/ocaml.yaml +++ b/runtime/syntax/ocaml.yaml @@ -40,3 +40,4 @@ rules: - comment: start: "\\(\\*" end: "\\*\\)" + rules: [] diff --git a/runtime/syntax/odin.yaml b/runtime/syntax/odin.yaml index fee4b573..1326356c 100644 --- a/runtime/syntax/odin.yaml +++ b/runtime/syntax/odin.yaml @@ -49,6 +49,7 @@ rules: - constant.string: start: "`" end: "`" + rules: [] - comment: start: "//" diff --git a/runtime/syntax/pascal.yaml b/runtime/syntax/pascal.yaml index bb51149c..ca6a4164 100644 --- a/runtime/syntax/pascal.yaml +++ b/runtime/syntax/pascal.yaml @@ -12,6 +12,7 @@ rules: - special: start: "asm" end: "end" + rules: [] - constant.number: "\\$[0-9A-Fa-f]+" - constant.number: "\\b[+-]?[0-9]+([.]?[0-9]+)?(?i:e[+-]?[0-9]+)?" - constant.string: @@ -28,13 +29,17 @@ rules: - preproc: start: "{\\$" end: "}" + rules: [] - comment: start: "//" end: "$" + rules: [] - comment: start: "\\(\\*" end: "\\*\\)" + rules: [] - comment: start: "({)(?:[^$])" end: "}" + rules: [] diff --git a/runtime/syntax/perl.yaml b/runtime/syntax/perl.yaml index 636c8c22..2b01b894 100644 --- a/runtime/syntax/perl.yaml +++ b/runtime/syntax/perl.yaml @@ -28,10 +28,12 @@ rules: start: "'" end: "'" skip: "\\\\'" + rules: [] - comment: start: "#" end: "$" + rules: [] - constant.string: "\"\\(.*\\)\"|qq?\\|.*\\||qq?\\{.*\\}|qq?\\/.*\\/" - constant.number: "\\b([0-9]*[.])?[0-9]+" @@ -43,11 +45,14 @@ rules: - preproc: start: "(^use| = new)" end: ";" + rules: [] - comment: start: "^=" end: "^=cut" + rules: [] - identifier.macro: start: "<< 'STOP'" end: "STOP" + rules: [] diff --git a/runtime/syntax/php.yaml b/runtime/syntax/php.yaml index a379abe2..8e57b8ca 100644 --- a/runtime/syntax/php.yaml +++ b/runtime/syntax/php.yaml @@ -40,9 +40,11 @@ rules: - comment: start: "(^|[[:space:]])*(//|#)" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] - constant.string: start: "\"" diff --git a/runtime/syntax/pony.yaml b/runtime/syntax/pony.yaml index 85ebaf33..214f11d0 100644 --- a/runtime/syntax/pony.yaml +++ b/runtime/syntax/pony.yaml @@ -26,10 +26,12 @@ rules: - comment: start: "\"\"\"[^\"]*" end: "\"\"\"" + rules: [] - comment: "(^|[[:space:]])//.*" - comment: start: "/\\*" end: "\\*/" + rules: [] - todo: "TODO:?" diff --git a/runtime/syntax/pov.yaml b/runtime/syntax/pov.yaml index 51791afe..ddf8496c 100644 --- a/runtime/syntax/pov.yaml +++ b/runtime/syntax/pov.yaml @@ -17,4 +17,5 @@ rules: - comment: start: "/\\*" end: "\\*/" + rules: [] diff --git a/runtime/syntax/python2.yaml b/runtime/syntax/python2.yaml index e5076a6a..3a993b05 100644 --- a/runtime/syntax/python2.yaml +++ b/runtime/syntax/python2.yaml @@ -32,10 +32,12 @@ rules: - constant.string: start: "\"\"\"" end: "\"\"\"" + rules: [] - constant.string: start: "'''" end: "'''" + rules: [] - constant.string: start: "\"" @@ -54,4 +56,5 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/python3.yaml b/runtime/syntax/python3.yaml index c5bab4df..a87a2cb9 100644 --- a/runtime/syntax/python3.yaml +++ b/runtime/syntax/python3.yaml @@ -34,10 +34,12 @@ rules: - constant.string: start: "\"\"\"" end: "\"\"\"" + rules: [] - constant.string: start: "'''" end: "'''" + rules: [] - constant.string: start: "\"" diff --git a/runtime/syntax/raku.yaml b/runtime/syntax/raku.yaml index fc13f04a..7523be5d 100644 --- a/runtime/syntax/raku.yaml +++ b/runtime/syntax/raku.yaml @@ -29,11 +29,14 @@ rules: - preproc: start: "(^use| = new)" end: ";" + rules: [] - identifier.macro: start: "<" - special: "^%(build$|changelog|check$|clean$|description)" diff --git a/runtime/syntax/ruby.yaml b/runtime/syntax/ruby.yaml index f36864e1..e48c6a15 100644 --- a/runtime/syntax/ruby.yaml +++ b/runtime/syntax/ruby.yaml @@ -34,6 +34,7 @@ rules: start: "'" end: "'" skip: "\\\\." + rules: [] - constant.string: start: "\"" @@ -66,5 +67,6 @@ rules: - constant.macro: start: "<<-?'?EOT'?" end: "^EOT" + rules: [] - preproc.shebang: "^#!.+?( |$)" diff --git a/runtime/syntax/rust.yaml b/runtime/syntax/rust.yaml index 6cc80001..5347e704 100644 --- a/runtime/syntax/rust.yaml +++ b/runtime/syntax/rust.yaml @@ -31,18 +31,22 @@ rules: - constant.string: start: "[bc]?r#\"" end: "\"#" + rules: [] - constant.string: start: "[bc]?r##\"" end: "\"##" + rules: [] - constant.string: start: "[bc]?r###\"" end: "\"###" + rules: [] - constant.string: start: "[bc]?r####+\"" end: "\"####+" + rules: [] # Character literals # NOTE: This is an ugly hack to work around the fact that rust uses @@ -54,6 +58,7 @@ rules: - constant.string: start: "'\"" end: "'" + rules: [] - comment: start: "//" @@ -70,3 +75,4 @@ rules: - special: start: "#!\\[" end: "\\]" + rules: [] diff --git a/runtime/syntax/sage.yaml b/runtime/syntax/sage.yaml index 1f6ed241..e24fbeb6 100644 --- a/runtime/syntax/sage.yaml +++ b/runtime/syntax/sage.yaml @@ -32,10 +32,12 @@ rules: - comment: start: "\"\"\"" end: "\"\"\"" + rules: [] - comment: start: "'''" end: "'''" + rules: [] - constant.string: start: "\"" @@ -54,4 +56,5 @@ rules: - comment: start: "#" end: "$" + rules: [] diff --git a/runtime/syntax/scad.yaml b/runtime/syntax/scad.yaml index 95094af1..0108e3ac 100644 --- a/runtime/syntax/scad.yaml +++ b/runtime/syntax/scad.yaml @@ -28,6 +28,7 @@ rules: - preproc: start: "^ *(use|include) <" end: ">;?" + rules: [] - constant.number: "\\b[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?|PI|inf|nan\\b" - constant.bool: "\\b(true|false)\\b" diff --git a/runtime/syntax/scala.yaml b/runtime/syntax/scala.yaml index a9548832..e38137c3 100644 --- a/runtime/syntax/scala.yaml +++ b/runtime/syntax/scala.yaml @@ -10,6 +10,7 @@ rules: - constant.string: start: "\"\"\"" end: "\"\"\"" + rules: [] - constant.string: start: "\"" end: "\"" @@ -20,10 +21,13 @@ rules: - comment: start: "//" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] - comment: start: "/\\*\\*" end: "\\*/" + rules: [] diff --git a/runtime/syntax/sh.yaml b/runtime/syntax/sh.yaml index fd716343..bb253858 100644 --- a/runtime/syntax/sh.yaml +++ b/runtime/syntax/sh.yaml @@ -48,16 +48,19 @@ rules: start: "\"" end: "\"" skip: "\\\\." + rules: [] - constant.string: start: "'" end: "'" skip: "\\\\." + rules: [] - constant.string: start: "<<[^\\s]+[-~.]*[A-Za-z0-9]+$" end: "^[^\\s]+[A-Za-z0-9]+$" skip: "\\\\." + rules: [] - comment: start: "(^|\\s)#" diff --git a/runtime/syntax/smalltalk.yaml b/runtime/syntax/smalltalk.yaml index 41056e9e..c595588c 100644 --- a/runtime/syntax/smalltalk.yaml +++ b/runtime/syntax/smalltalk.yaml @@ -18,6 +18,7 @@ rules: start: "'" end: "'" skip: "\\\\." + rules: [] - constant.string: start: "\"" @@ -49,5 +50,6 @@ rules: - constant.macro: start: "<<-?'?EOT'?" end: "^EOT" + rules: [] - preproc.shebang: "^#!.+?( |$)" diff --git a/runtime/syntax/solidity.yaml b/runtime/syntax/solidity.yaml index 599f566c..32fd40bf 100644 --- a/runtime/syntax/solidity.yaml +++ b/runtime/syntax/solidity.yaml @@ -20,9 +20,11 @@ rules: - comment: start: "//" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" + rules: [] - todo: "TODO:?" - constant.string: start: "\"" diff --git a/runtime/syntax/stata.yaml b/runtime/syntax/stata.yaml index b43d387f..5239c6c9 100644 --- a/runtime/syntax/stata.yaml +++ b/runtime/syntax/stata.yaml @@ -11,6 +11,7 @@ rules: - identifier.macro: start: "`" end: "'" + rules: [] - identifier.macro: "\\$\\w+" - constant.specialChar: "\\\\." @@ -21,6 +22,7 @@ rules: - identifier.macro: start: "`" end: "'" + rules: [] - identifier.macro: "\\$\\w+" - constant.specialChar: "\\\\." @@ -44,6 +46,7 @@ rules: - identifier.macro: start: "`" end: "'" + rules: [] - comment: start: "///?" diff --git a/runtime/syntax/tex.yaml b/runtime/syntax/tex.yaml index c94b3773..3ff84486 100644 --- a/runtime/syntax/tex.yaml +++ b/runtime/syntax/tex.yaml @@ -8,9 +8,11 @@ rules: - identifier: start: "\\{" end: "\\}" + rules: [] - identifier: start: "\\[" end: "\\]" + rules: [] # numbers - constant.number: "\\b[0-9]+(\\.[0-9]+)?([[:space:]](pt|mm|cm|in|ex|em|bp|pc|dd|cc|nd|nc|sp))?\\b" # let brackets have the default color again @@ -23,6 +25,8 @@ rules: - comment: start: "[^\\\\]%|^%" end: "$" + rules: [] - comment: start: "\\\\begin\\{comment\\}" end: "\\\\end\\{comment\\}" + rules: [] diff --git a/runtime/syntax/toml.yaml b/runtime/syntax/toml.yaml index f7073822..807872d6 100644 --- a/runtime/syntax/toml.yaml +++ b/runtime/syntax/toml.yaml @@ -27,9 +27,11 @@ rules: - constant.string: start: "'''" end: "'{3,5}" + rules: [] - constant.string: start: "'" end: "'" + rules: [] # Integer - constant.number: '[+-]?(\d+_)*\d+\b' - constant.number: '(0x([[:xdigit:]]+_)*[[:xdigit:]]+|0o([0-7]_)*[0-7]+|0b([01]+_)*[01]+)' diff --git a/runtime/syntax/twig.yaml b/runtime/syntax/twig.yaml index 25a9230e..b5409d12 100644 --- a/runtime/syntax/twig.yaml +++ b/runtime/syntax/twig.yaml @@ -52,3 +52,4 @@ rules: - comment: start: "\\{#" end: "#\\}" + rules: [] diff --git a/runtime/syntax/typescript.yaml b/runtime/syntax/typescript.yaml index 2197767b..958a7dbb 100644 --- a/runtime/syntax/typescript.yaml +++ b/runtime/syntax/typescript.yaml @@ -23,6 +23,7 @@ rules: - comment: start: "//" end: "$" + rules: [] - comment: start: "/\\*" end: "\\*/" diff --git a/runtime/syntax/v.yaml b/runtime/syntax/v.yaml index f4783938..304947b0 100644 --- a/runtime/syntax/v.yaml +++ b/runtime/syntax/v.yaml @@ -65,6 +65,7 @@ rules: - constant.string: start: "`" end: "`" + rules: [] - comment: start: "//" diff --git a/runtime/syntax/vala.yaml b/runtime/syntax/vala.yaml index cf2053c3..995c3fa4 100644 --- a/runtime/syntax/vala.yaml +++ b/runtime/syntax/vala.yaml @@ -19,6 +19,7 @@ rules: - comment: start: "/\\*" end: "\\*/" + rules: [] - todo: "TODO:?" - indent-char.whitespace: "[[:space:]]+$" diff --git a/runtime/syntax/vi.yaml b/runtime/syntax/vi.yaml index ad86e198..2a828dcd 100644 --- a/runtime/syntax/vi.yaml +++ b/runtime/syntax/vi.yaml @@ -14,6 +14,7 @@ rules: - comment: start: "(^\"|[ \t]+\" |[ \t]+\"$)" end: "$" + rules: [] - constant.string: start: "\"" diff --git a/runtime/syntax/vue.yaml b/runtime/syntax/vue.yaml index dbaa1e42..d5e10c34 100644 --- a/runtime/syntax/vue.yaml +++ b/runtime/syntax/vue.yaml @@ -27,6 +27,7 @@ rules: - comment.block: start: "" + rules: [] # Bootstrap - symbol.tag.extended: "(?i)<[/]?(b-alert|b-aspect|b-avatar|b-badge|b-icon|b-breadcrumb|b-button-group|b-button-toolbar|b-button|b-calendar|b-card-text|b-card-input|b-card|b-carousel-slide|b-carousel|b-collapse|b-dropdown|b-dropdown-item|b-dropdown-divider|b-embed|b-form-checkbox-group|b-form-checkbox|b-form-datepicker|b-form-file|b-form-group|b-form-input|b-form-radio|b-form-rating|b-form-select|b-form-spinbutton|b-form-tags|b-form-textarea|b-form|b-form-timepicker|b-img-lazy|b-img|b-input-group|b-jumbotron|b-input|b-container|b-row|b-col|b-link|b-list-group|b-list-group-item|b-media|b-modal|b-nav|b-nav-item|b-nav-item-dropdown|b-nav-text|b-nav-form|b-navbar|b-navbar-brand|b-navbar-toggle|b-navbar-nav|b-overlay|b-pagination|b-pagination-nav|b-popover|b-progress|b-progress-bar|b-sidebar|b-skeleton-wrapper|b-skeleton|b-spinner|b-table|b-table-lite|b-table-simple|b-tabs|b-tab|b-time|b-toast|b-tooltip)\\b" diff --git a/runtime/syntax/xml.yaml b/runtime/syntax/xml.yaml index a45bff05..df4cde81 100644 --- a/runtime/syntax/xml.yaml +++ b/runtime/syntax/xml.yaml @@ -8,10 +8,12 @@ rules: - preproc: start: "" + rules: [] - comment: start: "" + rules: [] - symbol.tag: start: "<\\??" @@ -20,6 +22,7 @@ rules: - identifier: start: " " end: "=" + rules: [] - constant.string: start: "\"" end: "\"" diff --git a/runtime/syntax/zsh.yaml b/runtime/syntax/zsh.yaml index a8420481..a2832131 100644 --- a/runtime/syntax/zsh.yaml +++ b/runtime/syntax/zsh.yaml @@ -43,8 +43,10 @@ rules: - constant.string: start: "'" end: "'" + rules: [] - comment: start: "(^|\\s)#" end: "$" + rules: [] From 3fd2fe3cc7902e907a6c10714f546fcbf24dab10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Sun, 31 Aug 2025 13:53:34 +0200 Subject: [PATCH 2/4] Revert "doc: syntax: Add hint about incompatibilities to previous versions" This reverts commit 02e69dddbe23bbbe97f71d7f5c0784b2dfd3e42e. --- runtime/syntax/README.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/runtime/syntax/README.md b/runtime/syntax/README.md index 959b33a9..a31acc02 100644 --- a/runtime/syntax/README.md +++ b/runtime/syntax/README.md @@ -33,19 +33,6 @@ Micro syntax files are almost identical to Nano's, except for some key differenc * Micro does not use `icolor`. Instead, for a case insensitive match, use the case insensitive flag (`i`) in the regular expression * For example, `icolor green ".*"` would become `color green "(?i).*"` -# Incompatibilities with older versions of micro - -With PR [#3458](https://github.com/zyedidia/micro/pull/3458) resp. commit -[a9b513a](https://github.com/zyedidia/micro/commit/a9b513a28adaaa7782505dc1e284e1a0132cb66f) -empty `rules: []` definitions are removed from all syntax files, since -`rules` are no longer mandatory. -Unfortunately they are mandatory for `micro` versions up to and including `v2.0.14`. - -To use newer syntax definitions from this repository with older `micro` versions -you have to add these `rules: []` to all regions not including `rules` already. -Otherwise you need to use syntax definitions before the above mentioned PR -for example from version [v2.0.14](https://github.com/zyedidia/micro/tree/v2.0.14). - # Using with colorschemes Not all of these files have been converted to use micro's colorscheme feature. Most of them just hardcode the colors, which can be problematic depending on the colorscheme you use. From d9245d9659b58fc4f5ffd879fcd7da4d88c3eee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Sun, 31 Aug 2025 18:53:45 +0200 Subject: [PATCH 3/4] syntax: Add the empty `rules: []` to the files currently "missing" them --- runtime/syntax/meson.yaml | 2 ++ runtime/syntax/nftables.yaml | 1 + runtime/syntax/ruby.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/runtime/syntax/meson.yaml b/runtime/syntax/meson.yaml index 7f339698..744abc2c 100755 --- a/runtime/syntax/meson.yaml +++ b/runtime/syntax/meson.yaml @@ -34,11 +34,13 @@ rules: - comment: start: "#" end: "$" + rules: [] # multiline strings do not support escape sequences - constant.string: start: "'''" end: "'''" + rules: [] - constant.string: start: "'" diff --git a/runtime/syntax/nftables.yaml b/runtime/syntax/nftables.yaml index d1f217ad..489fdb0b 100644 --- a/runtime/syntax/nftables.yaml +++ b/runtime/syntax/nftables.yaml @@ -15,6 +15,7 @@ rules: - constant.string: start: "\"" end: "\"" + rules: [] # Integer Constants - constant.number: "\\b([0-9]+)\\b" - constant.number: "\\b(0x[0-9a-fA-F]+)\\b" diff --git a/runtime/syntax/ruby.yaml b/runtime/syntax/ruby.yaml index e48c6a15..8915ed74 100644 --- a/runtime/syntax/ruby.yaml +++ b/runtime/syntax/ruby.yaml @@ -25,6 +25,7 @@ rules: - constant: start: "[$]([!@&`'+~=/\\\\,;.<>*$?:\"_]|-[A-Za-z0-9_]|[0-9]+)" end: "\\B|\\b" + rules: [] # Ruby "Symbols" - constant: "(i?)([ ]|^):[0-9A-Z_]+\\b" - constant: "\\b(__FILE__|__LINE__)\\b" From 52f629cee77e95611ab083e68f4cea6c34c18412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Sun, 31 Aug 2025 18:58:15 +0200 Subject: [PATCH 4/4] syntax: Fix invalid escape of `'` in php --- runtime/syntax/php.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/syntax/php.yaml b/runtime/syntax/php.yaml index 8e57b8ca..eb8cbdc7 100644 --- a/runtime/syntax/php.yaml +++ b/runtime/syntax/php.yaml @@ -53,8 +53,8 @@ rules: rules: - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]" - constant.string: - start: "\'" - end: "\'" + start: "'" + end: "'" skip: "\\\\." rules: - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"