Merge pull request #13048 from griggt/fix-13046

Fix #13046: `override` is a valid identifier in Java, not a keyword
scala · Jul 11, 2021 · a4eb717 · a4eb717
2 parents 7627583 + 9f346d3
commit a4eb717
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala
@@ -10,7 +10,7 @@ object JavaTokens extends TokensCommon {
 
   final val javaOnlyKeywords: TokenSet = tokenRange(INSTANCEOF, ASSERT)
   final val sharedKeywords: BitSet = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED,
-    OVERRIDE, EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
+    EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
   final val primTypes: TokenSet = tokenRange(VOID, DOUBLE)
   final val keywords: BitSet = sharedKeywords | javaOnlyKeywords | primTypes
 

diff --git a/tests/pos/i13046/A.java b/tests/pos/i13046/A.java
@@ -0,0 +1,3 @@
+interface A {
+    public boolean override();
+}
diff --git a/tests/pos/i13046/B.scala b/tests/pos/i13046/B.scala
@@ -0,0 +1,3 @@
+class B extends A {
+  override def `override`: Boolean = true
+}