Skip to content

Fix #154: Update given syntax #158

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
Dec 3, 2020
Merged

Fix #154: Update given syntax #158

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
8 changes: 8 additions & 0 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ export const scalaTmLanguage: TmLanguage = {
{
include: '#comments'
},
{
match: 'given',
name: 'keyword.other.import.given.scala'
},
{
match: idUpper,
name: 'entity.name.class.import.scala'
Expand Down Expand Up @@ -94,6 +98,10 @@ export const scalaTmLanguage: TmLanguage = {
}
}
},
{
match: 'given',
name: 'keyword.other.import.given.scala'
},
{
match: `(given\\s+)?(?:(${idUpper})|(${backQuotedId}|${plainid}))`,
captures: {
Expand Down
70 changes: 67 additions & 3 deletions tests/unit/imports.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,52 @@
// ^ 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 _}
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
// ^^^^^^^ - keyword.other.import.given.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 keyword.other.import.given.scala

import A.{given}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^ meta.import.scala keyword.other.import.given.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`, _}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^^^ - keyword.other.import.given.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, _}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^ meta.import.scala keyword.other.import.given.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
Expand All @@ -63,3 +99,31 @@
// ^ meta.import.scala meta.import.selector.scala
// ^^ meta.import.scala entity.name.class.import.scala
// ^ meta.import.scala meta.import.selector.scala

import A.{a, given Ordering[?]}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^ meta.import.scala entity.name.import.scala
// ^^ meta.import.scala meta.import.selector.scala
// ^^^^^ meta.import.scala keyword.other.import.given.scala
// ^ meta.import.scala meta.import.selector.scala
// ^^^^^^^^ meta.import.scala entity.name.class.import.scala
// ^^^^ meta.import.scala meta.import.selector.scala

import A.{given Ordering[?], given ExecutionContext}
// ^^^^^^ 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 meta.import.selector.scala meta.bracket.scala
// ^^^^^ meta.import.scala keyword.other.import.given.scala
// ^ meta.import.scala meta.import.selector.scala
// ^^^^^^^^ meta.import.scala entity.name.class.import.scala
// ^^^^^ meta.import.scala meta.import.selector.scala
// ^^^^^ meta.import.scala keyword.other.import.given.scala
// ^ meta.import.scala meta.import.selector.scala
// ^^^^^^^^^^^^^^^^ meta.import.scala entity.name.class.import.scala
// ^ meta.import.scala meta.import.selector.scala