Skip to content

Fix imports of packages or members with names starting with given #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2021
Merged

Fix imports of packages or members with names starting with given #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const scalaTmLanguage: TmLanguage = {
include: '#comments'
},
{
match: 'given',
match: '\\b(given)\\b',
name: 'keyword.other.import.given.scala'
},
{
Expand Down Expand Up @@ -101,7 +101,7 @@ export const scalaTmLanguage: TmLanguage = {
}
},
{
match: 'given',
match: '\\b(given)\\b',
name: 'keyword.other.import.given.scala'
},
{
Expand Down
14 changes: 14 additions & 0 deletions tests/unit/imports.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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