From 776384e14eb0a94be7e90c1aa4e2cde438de9fd7 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 27 Aug 2020 13:08:12 +0200 Subject: [PATCH] Remove a few left over TODOs --- src/scala/scala.test.ts | 6 +++--- src/scala/scala.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scala/scala.test.ts b/src/scala/scala.test.ts index df03d3fa..59b7f1c2 100644 --- a/src/scala/scala.test.ts +++ b/src/scala/scala.test.ts @@ -468,7 +468,7 @@ testTokenization('scala', [ line: '3_.1415F', tokens: [ { startIndex: 0, type: 'number.scala' }, - { startIndex: 1, type: 'keyword.scala' }, // TODO + { startIndex: 1, type: 'keyword.scala' }, { startIndex: 2, type: 'delimiter.scala' }, { startIndex: 3, type: 'number.float.scala' } ] @@ -479,7 +479,7 @@ testTokenization('scala', [ tokens: [ { startIndex: 0, type: 'number.scala' }, { startIndex: 1, type: 'operator.scala' }, - { startIndex: 2, type: 'keyword.flow.scala' } // TODO + { startIndex: 2, type: 'identifier.scala' } ] }], @@ -495,7 +495,7 @@ testTokenization('scala', [ line: '52_', tokens: [ { startIndex: 0, type: 'number.scala' }, - { startIndex: 2, type: 'keyword.scala' } // TODO + { startIndex: 2, type: 'keyword.scala' } ] }], diff --git a/src/scala/scala.ts b/src/scala/scala.ts index 0b016d0f..2094b3a5 100644 --- a/src/scala/scala.ts +++ b/src/scala/scala.ts @@ -140,7 +140,7 @@ export const language = { [/\bva[lr]\b/, 'keyword', '@vardef'], [/\b(def)([ \t]+)((?:unary_)?@symbols|@name(?:_=)|@name)/, ['keyword', 'white', 'identifier']], [/@name(?=[ \t]*:(?!:))/, 'variable'], - [/(\.)(@name|@symbols)/, ['operator', {token: 'keyword.flow', next: '@allowMethod'}]], + [/(\.)(@name|@symbols)/, ['operator', {token: '@rematch', next: '@allowMethod'}]], [/([{(])(\s*)(@name(?=\s*=>))/, ['@brackets', 'white', 'variable']], [/@name/, {cases: { '@keywords': 'keyword',