From bd847cb2a0e6a5e621519b286f51522be898436f Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 8 Jun 2017 15:33:52 +0200 Subject: [PATCH] Fix a few missing commas and indentation --- src/csharp.ts | 8 ++++---- test/csharp.test.ts | 40 ++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/csharp.ts b/src/csharp.ts index 99ba93bd..fc9ed2b4 100644 --- a/src/csharp.ts +++ b/src/csharp.ts @@ -90,7 +90,7 @@ export var language = { // delimiters and operators [/}/, { cases: { '$S2==interpolatedstring' : { token: 'string.quote', next: '@pop' } - '$S2==litinterpstring' : { token: 'string.quote', next: '@pop' } + , '$S2==litinterpstring' : { token: 'string.quote', next: '@pop' } , '@default' : '@brackets' } }], [/[{}()\[\]]/, '@brackets'], [/[<>](?!@symbols)/, '@brackets'], @@ -154,14 +154,14 @@ export var language = { [/"/, { token: 'string.quote', next: '@pop' } ] ], - litinterpstring: [ - [/[^"{]+/, 'string'], + litinterpstring: [ + [/[^"{]+/, 'string'], [/""/, 'string.escape'], [/{{/, 'string.escape'], [/}}/, 'string.escape'], [/{/, { token: 'string.quote', next: 'root.litinterpstring' } ], [/"/, { token: 'string.quote', next: '@pop' } ] - ], + ], interpolatedstring: [ [/[^\\"{]+/, 'string'], diff --git a/test/csharp.test.ts b/test/csharp.test.ts index 71cb333c..94187b79 100644 --- a/test/csharp.test.ts +++ b/test/csharp.test.ts @@ -742,24 +742,24 @@ testTokenization('csharp', [ { startIndex: 7, type: 'delimiter.cs' } ]}], - [{ - line: 'x = $@"verbatim {interpolated} string{{}}"" ";', - tokens: [ - { startIndex: 0, type: "identifier.cs" } - { startIndex: 1, type: "" } - { startIndex: 2, type: "delimiter.cs" } - { startIndex: 3, type: "" } - { startIndex: 4, type: "string.quote.cs" } - { startIndex: 7, type: "string.cs" } - { startIndex: 16, type: "string.quote.cs" } - { startIndex: 17, type: "identifier.cs" } - { startIndex: 29, type: "string.quote.cs" } - { startIndex: 30, type: "string.cs" } - { startIndex: 37, type: "string.escape.cs" } - { startIndex: 39, type: "string.cs" } - { startIndex: 41, type: "string.escape.cs" } - { startIndex: 43, type: "string.cs" } - { startIndex: 44, type: "string.quote.cs" } - { startIndex: 45, type: "delimiter.cs" } - ]}], + [{ + line: 'x = $@"verbatim {interpolated} string{{}}"" ";', + tokens: [ + { startIndex: 0, type: "identifier.cs" }, + { startIndex: 1, type: "" }, + { startIndex: 2, type: "delimiter.cs" }, + { startIndex: 3, type: "" }, + { startIndex: 4, type: "string.quote.cs" }, + { startIndex: 7, type: "string.cs" }, + { startIndex: 16, type: "string.quote.cs" }, + { startIndex: 17, type: "identifier.cs" }, + { startIndex: 29, type: "string.quote.cs" }, + { startIndex: 30, type: "string.cs" }, + { startIndex: 37, type: "string.escape.cs" }, + { startIndex: 39, type: "string.cs" }, + { startIndex: 41, type: "string.escape.cs" }, + { startIndex: 43, type: "string.cs" }, + { startIndex: 44, type: "string.quote.cs" }, + { startIndex: 45, type: "delimiter.cs" }, + ]}], ]);