Go: Added `char` token and improved `string` and `number` tokens (#3208)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263
diff --git a/components/prism-go.js b/components/prism-go.js
index fd1c6b0..9a89ea6 100644
--- a/components/prism-go.js
+++ b/components/prism-go.js
@@ -1,12 +1,28 @@
Prism.languages.go = Prism.languages.extend('clike', {
'string': {
- pattern: /(["'`])(?:\\[\s\S]|(?!\1)[^\\])*\1/,
+ pattern: /(^|[^\\])"(?:\\.|[^"\\\r\n])*"|`[^`]*`/,
+ lookbehind: true,
greedy: true
},
'keyword': /\b(?:break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(?:to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,
'boolean': /\b(?:_|false|iota|nil|true)\b/,
- 'number': /(?:\b0x[a-f\d]+|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[-+]?\d+)?)i?/i,
+ 'number': [
+ // binary and octal integers
+ /\b0(?:b[01_]+|o[0-7_]+)i?\b/i,
+ // hexadecimal integers and floats
+ /\b0x(?:[a-f\d_]+(?:\.[a-f\d_]*)?|\.[a-f\d_]+)(?:p[+-]?\d+(?:_\d+)*)?i?(?!\w)/i,
+ // decimal integers and floats
+ /(?:\b\d[\d_]*(?:\.[\d_]*)?|\B\.\d[\d_]*)(?:e[+-]?[\d_]+)?i?(?!\w)/i
+ ],
'operator': /[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,
'builtin': /\b(?:append|bool|byte|cap|close|complex|complex(?:64|128)|copy|delete|error|float(?:32|64)|u?int(?:8|16|32|64)?|imag|len|make|new|panic|print(?:ln)?|real|recover|rune|string|uintptr)\b/
});
+
+Prism.languages.insertBefore('go', 'string', {
+ 'char': {
+ pattern: /'(?:\\.|[^'\\\r\n]){0,10}'/,
+ greedy: true
+ }
+});
+
delete Prism.languages.go['class-name'];
diff --git a/components/prism-go.min.js b/components/prism-go.min.js
index 75ef29e..9cc2699 100644
--- a/components/prism-go.min.js
+++ b/components/prism-go.min.js
@@ -1 +1 @@
-Prism.languages.go=Prism.languages.extend("clike",{string:{pattern:/(["'`])(?:\\[\s\S]|(?!\1)[^\\])*\1/,greedy:!0},keyword:/\b(?:break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(?:to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,boolean:/\b(?:_|false|iota|nil|true)\b/,number:/(?:\b0x[a-f\d]+|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[-+]?\d+)?)i?/i,operator:/[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,builtin:/\b(?:append|bool|byte|cap|close|complex|complex(?:64|128)|copy|delete|error|float(?:32|64)|u?int(?:8|16|32|64)?|imag|len|make|new|panic|print(?:ln)?|real|recover|rune|string|uintptr)\b/}),delete Prism.languages.go["class-name"];
\ No newline at end of file
+Prism.languages.go=Prism.languages.extend("clike",{string:{pattern:/(^|[^\\])"(?:\\.|[^"\\\r\n])*"|`[^`]*`/,lookbehind:!0,greedy:!0},keyword:/\b(?:break|case|chan|const|continue|default|defer|else|fallthrough|for|func|go(?:to)?|if|import|interface|map|package|range|return|select|struct|switch|type|var)\b/,boolean:/\b(?:_|false|iota|nil|true)\b/,number:[/\b0(?:b[01_]+|o[0-7_]+)i?\b/i,/\b0x(?:[a-f\d_]+(?:\.[a-f\d_]*)?|\.[a-f\d_]+)(?:p[+-]?\d+(?:_\d+)*)?i?(?!\w)/i,/(?:\b\d[\d_]*(?:\.[\d_]*)?|\B\.\d[\d_]*)(?:e[+-]?[\d_]+)?i?(?!\w)/i],operator:/[*\/%^!=]=?|\+[=+]?|-[=-]?|\|[=|]?|&(?:=|&|\^=?)?|>(?:>=?|=)?|<(?:<=?|=|-)?|:=|\.\.\./,builtin:/\b(?:append|bool|byte|cap|close|complex|complex(?:64|128)|copy|delete|error|float(?:32|64)|u?int(?:8|16|32|64)?|imag|len|make|new|panic|print(?:ln)?|real|recover|rune|string|uintptr)\b/}),Prism.languages.insertBefore("go","string",{char:{pattern:/'(?:\\.|[^'\\\r\n]){0,10}'/,greedy:!0}}),delete Prism.languages.go["class-name"];
\ No newline at end of file
diff --git a/tests/languages/go/char_feature.test b/tests/languages/go/char_feature.test
new file mode 100644
index 0000000..32a3d1e
--- /dev/null
+++ b/tests/languages/go/char_feature.test
@@ -0,0 +1,29 @@
+'a'
+'ä'
+'本'
+'\t'
+'\000'
+'\007'
+'\377'
+'\x07'
+'\xff'
+'\u12e4'
+'\U00101234'
+'\''
+
+----------------------------------------------------
+
+[
+ ["char", "'a'"],
+ ["char", "'ä'"],
+ ["char", "'本'"],
+ ["char", "'\\t'"],
+ ["char", "'\\000'"],
+ ["char", "'\\007'"],
+ ["char", "'\\377'"],
+ ["char", "'\\x07'"],
+ ["char", "'\\xff'"],
+ ["char", "'\\u12e4'"],
+ ["char", "'\\U00101234'"],
+ ["char", "'\\''"]
+]
diff --git a/tests/languages/go/number_feature.test b/tests/languages/go/number_feature.test
index f21b3e8..8641477 100644
--- a/tests/languages/go/number_feature.test
+++ b/tests/languages/go/number_feature.test
@@ -2,19 +2,48 @@
0600
0xBadFace
170141183460469231731687303715884105727
+42
+4_2
+0600
+0_600
+0o600
+0O600 // second character is capital letter 'O'
+0xBadFace
+0xBad_Face
+0x_67_7a_2f_cc_40_c6
+170141183460469231731687303715884105727
+170_141183_460469_231731_687303_715884_105727
+
+0.
72.40
-072.40
+072.40 // == 72.40
2.71828
1.e+0
6.67428e-11
1E6
+.25
+.12345E+5
+1_5. // == 15.0
+0.15e+0_2 // == 15.0
+
+0x1p-2 // == 0.25
+0x2.p10 // == 2048.0
+0x1.Fp+0 // == 1.9375
+0X.8p-0 // == 0.5
+0X_1FFFP-16 // == 0.1249847412109375
+
0i
-011i
+0123i // == 123i for backward-compatibility
+0o123i // == 0o123 * 1i == 83i
+0xabci // == 0xabc * 1i == 2748i
0.i
2.71828i
1.e+0i
6.67428e-11i
1E6i
+.25i
+.12345E+5i
+0x1p-2i // == 0x1p-2 * 1i == 0.25i
----------------------------------------------------
@@ -23,21 +52,51 @@
["number", "0600"],
["number", "0xBadFace"],
["number", "170141183460469231731687303715884105727"],
+ ["number", "42"],
+ ["number", "4_2"],
+ ["number", "0600"],
+ ["number", "0_600"],
+ ["number", "0o600"],
+ ["number", "0O600"],
+ ["comment", "// second character is capital letter 'O'"],
+ ["number", "0xBadFace"],
+ ["number", "0xBad_Face"],
+ ["number", "0x_67_7a_2f_cc_40_c6"],
+ ["number", "170141183460469231731687303715884105727"],
+ ["number", "170_141183_460469_231731_687303_715884_105727"],
+
+ ["number", "0."],
["number", "72.40"],
- ["number", "072.40"],
+ ["number", "072.40"], ["comment", "// == 72.40"],
["number", "2.71828"],
["number", "1.e+0"],
["number", "6.67428e-11"],
["number", "1E6"],
+ ["number", ".25"],
+ ["number", ".12345E+5"],
+ ["number", "1_5."], ["comment", "// == 15.0"],
+ ["number", "0.15e+0_2"], ["comment", "// == 15.0"],
+
+ ["number", "0x1p-2"], ["comment", "// == 0.25"],
+ ["number", "0x2.p10"], ["comment", "// == 2048.0"],
+ ["number", "0x1.Fp+0"], ["comment", "// == 1.9375"],
+ ["number", "0X.8p-0"], ["comment", "// == 0.5"],
+ ["number", "0X_1FFFP-16"], ["comment", "// == 0.1249847412109375"],
+
["number", "0i"],
- ["number", "011i"],
+ ["number", "0123i"], ["comment", "// == 123i for backward-compatibility"],
+ ["number", "0o123i"], ["comment", "// == 0o123 * 1i == 83i"],
+ ["number", "0xabci"], ["comment", "// == 0xabc * 1i == 2748i"],
["number", "0.i"],
["number", "2.71828i"],
["number", "1.e+0i"],
["number", "6.67428e-11i"],
- ["number", "1E6i"]
+ ["number", "1E6i"],
+ ["number", ".25i"],
+ ["number", ".12345E+5i"],
+ ["number", "0x1p-2i"], ["comment", "// == 0x1p-2 * 1i == 0.25i"]
]
----------------------------------------------------
-Checks for integers, floats and imaginary numbers.
\ No newline at end of file
+Checks for integers, floats and imaginary numbers.
diff --git a/tests/languages/go/punctuation_feature.test b/tests/languages/go/punctuation_feature.test
new file mode 100644
index 0000000..48cac5f
--- /dev/null
+++ b/tests/languages/go/punctuation_feature.test
@@ -0,0 +1,18 @@
+( ) { } [ ]
+, ; . :
+
+----------------------------------------------------
+
+[
+ ["punctuation", "("],
+ ["punctuation", ")"],
+ ["punctuation", "{"],
+ ["punctuation", "}"],
+ ["punctuation", "["],
+ ["punctuation", "]"],
+
+ ["punctuation", ","],
+ ["punctuation", ";"],
+ ["punctuation", "."],
+ ["punctuation", ":"]
+]
diff --git a/tests/languages/go/string_feature.test b/tests/languages/go/string_feature.test
index 97e3960..93d9bf9 100644
--- a/tests/languages/go/string_feature.test
+++ b/tests/languages/go/string_feature.test
@@ -1,13 +1,10 @@
-'a'
-'ä'
-'本'
-'\t'
-'\xff'
-'\u12e4'
-
+``
`abc`
`\n
\n`
+`\`
+
+""
"\n"
"\""
"Hello, world!\n"
@@ -17,14 +14,12 @@
----------------------------------------------------
[
- ["string", "'a'"],
- ["string", "'ä'"],
- ["string", "'本'"],
- ["string", "'\\t'"],
- ["string", "'\\xff'"],
- ["string", "'\\u12e4'"],
+ ["string", "``"],
["string", "`abc`"],
["string", "`\\n\r\n\\n`"],
+ ["string", "`\\`"],
+
+ ["string", "\"\""],
["string", "\"\\n\""],
["string", "\"\\\"\""],
["string", "\"Hello, world!\\n\""],
@@ -34,4 +29,4 @@
----------------------------------------------------
-Checks for runes and strings.
\ No newline at end of file
+Checks for runes and strings.