github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-02-05 06:30:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add skip statements to all strings

Browse Source
This commit is contained in:
Zachary Yedidia
2017-03-29 09:45:16 -04:00
parent a517ea45bd
commit 47ef864295
51 changed files with 135 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/micro/highlight/highlighter.go
View File

@@ -75,7 +75,7 @@ func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []rune, canMatchSt
var strbytes []byte
if skip != nil {
strbytes = skip.ReplaceAllFunc(strbytes, func(match []byte) []byte {
strbytes = skip.ReplaceAllFunc([]byte(string(str)), func(match []byte) []byte {
res := make([]byte, utf8.RuneCount(match))
return res
})

98
cmd/micro/runtime.go
View File

File diff suppressed because one or more lines are too long

1
runtime/syntax/apacheconf.yaml
View File

@@ -47,6 +47,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/arduino.yaml
View File

@@ -75,12 +75,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- preproc: "..+"
- constant.specialChar: "\\\\."

2
runtime/syntax/asm.yaml
View File

@@ -91,12 +91,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/awk.yaml
View File

@@ -25,12 +25,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/c.yaml
View File

@@ -28,12 +28,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- preproc: "..+"
- constant.specialChar: "\\\\."

1
runtime/syntax/caddyfile.yaml
View File

@@ -11,6 +11,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/clojure.yaml
View File

@@ -25,6 +25,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "(\\\\u[0-9A-fa-f]{4,4}|\\\\newline|\\\\space|\\\\tab|\\\\formfeed|\\\\backspace|\\\\return|\\\\.)"

2
runtime/syntax/cmake.yaml
View File

@@ -16,12 +16,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/coffeescript.yaml
View File

@@ -17,6 +17,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/conf.yaml
View File

@@ -7,6 +7,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules: []
- comment:

2
runtime/syntax/cpp.yaml
View File

@@ -29,12 +29,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- preproc: "..+"
- constant.specialChar: "\\\\."

7
runtime/syntax/crystal.yaml
View File

@@ -33,14 +33,17 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialchar: "\\\\."
- constant.specialChar: "\\\\."
- special: "#\\{[^}]*\\}"
- constant.string:
start: "'"
end: "'"
rules: []
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- comment:
start: "#"

2
runtime/syntax/csharp.yaml
View File

@@ -24,6 +24,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
- constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
@@ -31,6 +32,7 @@ rules:
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
- constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"

2
runtime/syntax/css.yaml
View File

@@ -25,11 +25,13 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- special: "\"|'"

2
runtime/syntax/cython.yaml
View File

@@ -33,12 +33,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/d.yaml
View File

@@ -53,6 +53,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
# WysiwygString

2
runtime/syntax/dart.yaml
View File

@@ -33,12 +33,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/dockerfile.yaml
View File

@@ -23,12 +23,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/dot.yaml
View File

@@ -11,6 +11,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/fish.yaml
View File

@@ -30,12 +30,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules: []
- comment:

2
runtime/syntax/fortran.yaml
View File

@@ -44,12 +44,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/gdscript.yaml
View File

@@ -47,12 +47,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"

2
runtime/syntax/gentoo-ebuild.yaml
View File

@@ -29,12 +29,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/go.yaml
View File

@@ -30,6 +30,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "%."
- constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
@@ -38,6 +39,7 @@ rules:
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- error: "..+"
- constant.specialChar: "%."

2
runtime/syntax/golo.yaml
View File

@@ -48,12 +48,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/haskell.yaml
View File

@@ -30,6 +30,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/html.yaml
View File

@@ -11,6 +11,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/java.yaml
View File

@@ -13,12 +13,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- preproc: "..+"
- constant.specialChar: "\\\\."

2
runtime/syntax/javascript.yaml
View File

@@ -22,12 +22,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

3
runtime/syntax/json.yaml
View File

@@ -13,12 +13,15 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- statement: "\\\"(\\\\\"|[^\"])*\\\"[[:space:]]*:\" \"'(\\'|[^'])*'[[:space:]]*:"
- constant: "\\\\u[0-9a-fA-F]{4}|\\\\[bfnrt'\"/\\\\]"

2
runtime/syntax/keymap.yaml
View File

@@ -11,11 +11,13 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- comment:

1
runtime/syntax/lilypond.yaml
View File

@@ -12,6 +12,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- comment:

2
runtime/syntax/lua.yaml
View File

@@ -27,12 +27,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/makefile.yaml
View File

@@ -19,11 +19,13 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- identifier: "\\$+(\\{[^} ]+\\}|\\([^) ]+\\))"

1
runtime/syntax/micro.yaml
View File

@@ -16,6 +16,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.number: "#[0-9 A-F a-f]+"

2
runtime/syntax/objc.yaml
View File

@@ -35,12 +35,14 @@ rules:
- constant.string:
start: "@\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/pascal.yaml
View File

@@ -23,6 +23,7 @@ rules:
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- preproc:

2
runtime/syntax/python2.yaml
View File

@@ -42,12 +42,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/python3.yaml
View File

@@ -41,12 +41,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/rust.yaml
View File

@@ -20,6 +20,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/scala.yaml
View File

@@ -10,6 +10,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant: "\\b(true|false|null)\\b"

1
runtime/syntax/sh.yaml
View File

@@ -26,6 +26,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/solidity.yaml
View File

@@ -29,11 +29,13 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/swift.yaml
View File

@@ -27,6 +27,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/toml.yaml
View File

@@ -17,12 +17,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/typescript.yaml
View File

@@ -32,11 +32,13 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/vi.yaml
View File

@@ -13,12 +13,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

2
runtime/syntax/yaml.yaml
View File

@@ -17,12 +17,14 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."

1
runtime/syntax/zsh.yaml
View File

@@ -36,6 +36,7 @@ rules:
- constant.string:
start: "\""
end: "\""
skip: "\\\\."
rules:
- constant.specialChar: "\\\\."