Merge pull request #63 from finalfantasia/master

[clojure] treat comma as whitespace
microsoft · Aug 12, 2019 · 1c6738c · 1c6738c
2 parents 7da3699 + 67eac92
commit 1c6738c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/clojure/clojure.test.ts b/src/clojure/clojure.test.ts
@@ -897,5 +897,23 @@ testTokenization('clojure', [
 		'`',
 		'~',
 		"'",
-	], 'meta')
+	], 'meta'),
+
+	// treat comma as whitespace
+	[
+		{
+			line: ', foo, :bar, "one", 2, ',
+			tokens: [
+				{startIndex: 0, type: 'white.clj'},
+				{startIndex: 2, type: 'identifier.clj'},
+				{startIndex: 5, type: 'white.clj'},
+				{startIndex: 7, type: 'constant.clj'},
+				{startIndex: 11, type: 'white.clj'},
+				{startIndex: 13, type: 'string.clj'},
+				{startIndex: 18, type: 'white.clj'},
+				{startIndex: 20, type: 'number.clj'},
+				{startIndex: 21, type: 'white.clj'}
+			]
+		}
+	]
 ]);
diff --git a/src/clojure/clojure.ts b/src/clojure/clojure.ts
@@ -768,7 +768,7 @@ export const language = <ILanguage>{
 		],
 
 		whitespace: [
-			[/\s+/, 'white'],
+			[/[\s,]+/, 'white'],
 			[/;.*$/, 'comment'],
 			[/\(comment\b/, 'comment', '@comment'],
 		],