Merge pull request #13048 from griggt/fix-13046

Fix #13046: `override` is a valid identifier in Java, not a keyword

Author: smarter

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
 

tests/pos/i13046/A.java

@@ -0,0 +1,3 @@
+interface A {
+    public boolean override();
+}

tests/pos/i13046/B.scala

@@ -0,0 +1,3 @@
+class B extends A {
+  override def `override`: Boolean = true
+}