diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts index d84900a..77d7331 100644 --- a/src/typescript/Scala.tmLanguage.ts +++ b/src/typescript/Scala.tmLanguage.ts @@ -840,7 +840,7 @@ export const scalaTmLanguage: TmLanguage = { match: `\\b(package)\\s+(object)\\b\\s*${notStartOfComment}(${anyId})?`, captures: { '1': { - name: 'keyword.other.scoping.scala' + name: 'keyword.other.package.scala' }, '2': { name: 'keyword.declaration.scala' @@ -855,7 +855,7 @@ export const scalaTmLanguage: TmLanguage = { begin: '\\b(package)\\s+', beginCaptures: { '1': { - name: 'keyword.other.import.scala' + name: 'keyword.other.package.scala' } }, patterns: [ diff --git a/tests/snap/comments.test.scala.snap b/tests/snap/comments.test.scala.snap index b4ba65e..1f4ced2 100644 --- a/tests/snap/comments.test.scala.snap +++ b/tests/snap/comments.test.scala.snap @@ -225,7 +225,7 @@ #^ source.scala comment.block.documentation.scala # ^^ source.scala comment.block.documentation.scala punctuation.definition.comment.scala >package complex {} -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^^^^^^ source.scala meta.package.scala entity.name.package.scala # ^^^^ source.scala meta.package.scala diff --git a/tests/snap/end.test.scala.snap b/tests/snap/end.test.scala.snap index 3934390..d20c657 100644 --- a/tests/snap/end.test.scala.snap +++ b/tests/snap/end.test.scala.snap @@ -6,7 +6,7 @@ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.scala comment.line.double-slash.scala > >package p1.p2: -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^ source.scala meta.package.scala entity.name.package.scala # ^ source.scala meta.package.scala punctuation.definition.package diff --git a/tests/snap/scala_spec.test.scala.snap b/tests/snap/scala_spec.test.scala.snap index 0ef87d2..ccef9c4 100644 --- a/tests/snap/scala_spec.test.scala.snap +++ b/tests/snap/scala_spec.test.scala.snap @@ -1,5 +1,5 @@ >package org.scala.syntax -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^^ source.scala meta.package.scala entity.name.package.scala # ^ source.scala meta.package.scala punctuation.definition.package @@ -7,7 +7,7 @@ # ^ source.scala meta.package.scala punctuation.definition.package # ^^^^^^ source.scala meta.package.scala entity.name.package.scala >package test -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^^^ source.scala meta.package.scala entity.name.package.scala > @@ -333,7 +333,7 @@ #^ source.scala punctuation.section.block.end.scala > >package org.scala { -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^^ source.scala meta.package.scala entity.name.package.scala # ^ source.scala meta.package.scala punctuation.definition.package @@ -2284,13 +2284,13 @@ #^ source.scala punctuation.section.block.end.scala > >package p1 { -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^ source.scala meta.package.scala entity.name.package.scala # ^^^ source.scala meta.package.scala > package p2 { #^^^^ source.scala -# ^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +# ^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^^ source.scala meta.package.scala entity.name.package.scala # ^^^ source.scala meta.package.scala @@ -2306,7 +2306,7 @@ #^ source.scala punctuation.section.block.end.scala > >package a.b { -#^^^^^^^ source.scala meta.package.scala keyword.other.import.scala +#^^^^^^^ source.scala meta.package.scala keyword.other.package.scala # ^ source.scala meta.package.scala # ^ source.scala meta.package.scala entity.name.package.scala # ^ source.scala meta.package.scala punctuation.definition.package diff --git a/tests/unit/fast-definitions.test.scala b/tests/unit/fast-definitions.test.scala index 4c52428..eb46e49 100644 --- a/tests/unit/fast-definitions.test.scala +++ b/tests/unit/fast-definitions.test.scala @@ -41,5 +41,5 @@ // ^^^ keyword.declaration.scala package object -// ^^^^^^^ keyword.other.scoping.scala +// ^^^^^^^ keyword.other.package.scala // ^^^^^^ keyword.declaration.scala