From 259b2dadbb256e30ff045305afaf866524ea16fb Mon Sep 17 00:00:00 2001 From: Maxime Kjaer Date: Thu, 21 Jan 2021 22:01:13 +0100 Subject: [PATCH] Fix imports of packages or members with names starting with given Fixes #189 --- src/typescript/Scala.tmLanguage.ts | 4 ++-- tests/unit/imports.test.scala | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index ee44463..434b428 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -53,7 +53,7 @@ export const scalaTmLanguage: TmLanguage = { include: '#comments' }, { - match: 'given', + match: '\\b(given)\\b', name: 'keyword.other.import.given.scala' }, { @@ -101,7 +101,7 @@ export const scalaTmLanguage: TmLanguage = { } }, { - match: 'given', + match: '\\b(given)\\b', name: 'keyword.other.import.given.scala' }, { diff --git a/tests/unit/imports.test.scala b/tests/unit/imports.test.scala index fcbbab5..91a4daf 100644 --- a/tests/unit/imports.test.scala +++ b/tests/unit/imports.test.scala @@ -127,3 +127,17 @@ // ^ meta.import.scala meta.import.selector.scala // ^^^^^^^^^^^^^^^^ meta.import.scala entity.name.class.import.scala // ^ meta.import.scala meta.import.selector.scala + + import A.givenSomething +// ^^^^^^ meta.import.scala keyword.other.import.scala +// ^ meta.import.scala +// ^ meta.import.scala entity.name.class.import.scala +// ^ meta.import.scala punctuation.definition.import +// ^^^^^^^^^^^^^^ meta.import.scala entity.name.import.scala + + import givenPackage.x +// ^^^^^^ meta.import.scala keyword.other.import.scala +// ^ meta.import.scala +// ^^^^^^^^^^^^ meta.import.scala entity.name.import.scala +// ^ meta.import.scala punctuation.definition.import +// ^ meta.import.scala entity.name.import.scala \ No newline at end of file