Fix spelling of includeOverridden

Author: odersky

compiler/src/dotty/tools/dotc/interactive/Interactive.scala

@@ -125,14 +125,14 @@ object Interactive {
    *  source code.
    *
    *  @param includeReferences  If true, include references and not just definitions
-   *  @param includeOverriden   If true, include trees whose symbol is overriden by `sym`
+   *  @param includeOverridden  If true, include trees whose symbol is overriden by `sym`
    */
-  def namedTrees(trees: List[SourceTree], includeReferences: Boolean, includeOverriden: Boolean, sym: Symbol)
+  def namedTrees(trees: List[SourceTree], includeReferences: Boolean, includeOverridden: Boolean, sym: Symbol)
    (implicit ctx: Context): List[SourceTree] =
     if (!sym.exists)
       Nil
     else
-      namedTrees(trees, includeReferences, matchSymbol(_, sym, includeOverriden))
+      namedTrees(trees, includeReferences, matchSymbol(_, sym, includeOverridden))
 
   /** Find named trees with a non-empty position whose name contains `nameSubstring` in `trees`.
    *
@@ -184,10 +184,10 @@ object Interactive {
    *  The reason for (2) is that if a symbol comes from a SourcefileLoader it is
    *  different from the symbol that was referred to, until the next run is started.
    */
-  def matchSymbol(tree: Tree, sym: Symbol, includeOverriden: Boolean)(implicit ctx: Context): Boolean =
+  def matchSymbol(tree: Tree, sym: Symbol, includeOverridden: Boolean)(implicit ctx: Context): Boolean =
     (sym == tree.symbol) ||
     sym.name == tree.symbol.name && sym.owner.isClass && sym.owner == tree.symbol.owner ||
-    (includeOverriden && tree.symbol.allOverriddenSymbols.contains(sym))
+    (includeOverridden && tree.symbol.allOverriddenSymbols.contains(sym))
 
 
   /** The reverse path to the node that closest encloses position `pos`,

compiler/src/dotty/tools/dotc/interactive/SourceTree.scala

@@ -48,7 +48,7 @@ object SourceTree {
       def sourceTreeOfClass(tree: tpd.Tree): Option[SourceTree] = tree match {
         case PackageDef(_, stats) =>
           stats.flatMap(sourceTreeOfClass).headOption
-        case tree: tpd.TypeDef if matchSymbol(tree, sym, includeOverriden = false) =>
+        case tree: tpd.TypeDef if matchSymbol(tree, sym, includeOverridden = false) =>
           val sourceFile = new SourceFile(sym.sourceFile, Codec.UTF8)
           Some(SourceTree(tree, sourceFile))
         case _ => None

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -224,7 +224,7 @@ class DottyLanguageServer extends LanguageServer
       // behave with respect to overriding and overriden definitions, ideally
       // this should be part of the LSP protocol.
       val trees = SourceTree.fromSymbol(sym.topLevelClass.asClass).toList
-      val defs = Interactive.namedTrees(trees, includeReferences = false, includeOverriden = true, sym)
+      val defs = Interactive.namedTrees(trees, includeReferences = false, includeOverridden = true, sym)
       defs.map(d => location(d.namePos)).asJava
     }
   }
@@ -246,7 +246,7 @@ class DottyLanguageServer extends LanguageServer
       val trees = driver.allTreesContaining(sym.name.toString)
       val refs = Interactive.namedTrees(trees, includeReferences = true, (tree: tpd.NameTree) =>
         (includeDeclaration || !Interactive.isDefinition(tree))
-          && Interactive.matchSymbol(tree, sym, includeOverriden = true))
+          && Interactive.matchSymbol(tree, sym, includeOverridden = true))
 
       refs.map(ref => location(ref.namePos)).asJava
     }
@@ -267,8 +267,8 @@ class DottyLanguageServer extends LanguageServer
       val newName = params.getNewName
 
       val refs = Interactive.namedTrees(trees, includeReferences = true, tree =>
-        (Interactive.matchSymbol(tree, sym, includeOverriden = true)
-          || (linkedSym != NoSymbol && Interactive.matchSymbol(tree, linkedSym, includeOverriden = true))))
+        (Interactive.matchSymbol(tree, sym, includeOverridden = true)
+          || (linkedSym != NoSymbol && Interactive.matchSymbol(tree, linkedSym, includeOverridden = true))))
 
       val changes = refs.groupBy(ref => toUri(ref.source).toString).mapValues(_.map(ref => new TextEdit(range(ref.namePos), newName)).asJava)
 
@@ -287,7 +287,7 @@ class DottyLanguageServer extends LanguageServer
 
     if (sym == NoSymbol) Nil.asJava
     else {
-      val refs = Interactive.namedTrees(uriTrees, includeReferences = true, includeOverriden = true, sym)
+      val refs = Interactive.namedTrees(uriTrees, includeReferences = true, includeOverridden = true, sym)
       refs.map(ref => new DocumentHighlight(range(ref.namePos), DocumentHighlightKind.Read)).asJava
     }
   }