Smalltalk: Fixed single quote character literal (#2041)

This fixes the incorrect tokenization of the character literals of single quotes which were recognized as string delimiters.
PrismJS · Sep 4, 2019 · 1aabcd1 · 1aabcd1
1 parent 365faad
commit 1aabcd1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/components/prism-smalltalk.js b/components/prism-smalltalk.js
@@ -1,5 +1,9 @@
 Prism.languages.smalltalk = {
 	'comment': /"(?:""|[^"])*"/,
+	'character': {
+		pattern: /\$./,
+		alias: 'string'
+	},
 	'string': /'(?:''|[^'])*'/,
 	'symbol': /#[\da-z]+|#(?:-|([+\/\\*~<>=@%|&?!])\1?)|#(?=\()/i,
 	'block-arguments': {
@@ -18,10 +22,6 @@ Prism.languages.smalltalk = {
 		}
 	},
 	'keyword': /\b(?:nil|true|false|self|super|new)\b/,
-	'character': {
-		pattern: /\$./,
-		alias: 'string'
-	},
 	'number': [
 		/\d+r-?[\dA-Z]+(?:\.[\dA-Z]+)?(?:e-?\d+)?/,
 		/\b\d+(?:\.\d+)?(?:e-?\d+)?/

diff --git a/components/prism-smalltalk.min.js b/components/prism-smalltalk.min.js
diff --git a/tests/languages/smalltalk/string_character_feature.test b/tests/languages/smalltalk/string_character_feature.test
@@ -0,0 +1,13 @@
+$'
+'foobar'
+
+----------------------------------------------------
+
+[
+	["character", "$'"],
+	["string", "'foobar'"]
+]
+
+----------------------------------------------------
+
+Checks a single-quote-character doesn't confuse string parsing.