Skip to content

Improve given imports #94

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
Jun 29, 2020
Merged

Improve given imports #94

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
21 changes: 8 additions & 13 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ export const scalaTmLanguage: TmLanguage = {
{
include: '#comments'
},
{
match: `(given)(?=\\s)`,
name: 'keyword.given.import.scala'
},
{
match: `(${backQuotedId}|${plainid})`,
name: 'entity.name.import.scala'
Expand All @@ -72,33 +68,32 @@ export const scalaTmLanguage: TmLanguage = {
},
patterns: [
{
match: `(?x)\\s*(${backQuotedId}|${plainid})\\s*(=>)\\s*(${backQuotedId}|${plainid})\\s*`,
match: `(?x)(given\\s)?\\s*(${backQuotedId}|${plainid})\\s*(=>)\\s*(${backQuotedId}|${plainid})\\s*`,
captures: {
'1': {
name: 'entity.name.import.renamed-from.scala'
name: 'keyword.other.given.scala'
},
'2': {
name: 'keyword.other.arrow.scala'
name: 'entity.name.import.renamed-from.scala'
},
'3': {
name: 'keyword.other.arrow.scala'
},
'4': {
name: 'entity.name.import.renamed-to.scala'
}
}
},
{
match: `(given)(\\s+${plainid})?(?=\\s*[,}])`,
match: `(given\\s+)?([^\\s.,}]+)`,
captures: {
'1': {
name: 'keyword.given.import.scala'
},
'2': {
name: 'entity.name.type.import.scala'
name: 'entity.name.import.scala'
}
}
},
{
match: '([^\\s.,}]+)',
name: 'entity.name.import.scala'
}
],
endCaptures: {
Expand Down
65 changes: 65 additions & 0 deletions tests/unit/imports.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// SYNTAX TEST "source.scala"

import
// ^^^^^^ meta.import.scala keyword.other.import.scala


import a.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

import a._
// ^^^^^^ 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

import a.{x, y}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^ meta.import.scala entity.name.import.scala
// ^^ meta.import.scala meta.import.selector.scala
// ^ meta.import.scala meta.import.selector.scala entity.name.import.scala
// ^ meta.import.scala meta.import.selector.scala meta.bracket.scala

import a.{x => y}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^ meta.import.scala meta.import.selector.scala entity.name.import.renamed-from.scala
// ^ meta.import.scala meta.import.selector.scala
// ^^ meta.import.scala meta.import.selector.scala
// ^ meta.import.scala meta.import.selector.scala
// ^ meta.import.scala meta.import.selector.scala entity.name.import.renamed-to.scala
// ^ meta.import.scala meta.import.selector.scala meta.bracket.scala

import a.{given _}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^ meta.import.scala keyword.given.import.scala
// ^ meta.import.scala meta.import.selector.scala
// ^ meta.import.scala entity.name.import.scala
// ^ meta.import.scala meta.import.selector.scala

import A.{given TC}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^ meta.import.scala keyword.given.import.scala
// ^ meta.import.scala meta.import.selector.scala
// ^^ meta.import.scala entity.name.import.scala
// ^ meta.import.scala meta.import.selector.scala