Tweak NavigateAST.toPath

odersky · odersky · commit 944c08bc52d4 · 2019-05-09T20:12:13.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala
@@ -79,7 +79,9 @@ object NavigateAST {
           case _ => path
         }
         if ((path1 ne path) &&
-            ((bestFit eq path) || bestFit.head.span.contains(path1.head.span)))
+            ((bestFit eq path) ||
+             bestFit.head.span != path1.head.span &&
+             bestFit.head.span.contains(path1.head.span)))
           bestFit = path1
       }
       bestFit

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,9 @@ object NavigateAST {`
`79`	`79`	`case _ => path`
`80`	`80`	`}`
`81`	`81`	`if ((path1 ne path) &&`
`82`		`- ((bestFit eq path) \|\| bestFit.head.span.contains(path1.head.span)))`
	`82`	`+ ((bestFit eq path) \|\|`
	`83`	`+ bestFit.head.span != path1.head.span &&`
	`84`	`+ bestFit.head.span.contains(path1.head.span)))`
`83`	`85`	`bestFit = path1`
`84`	`86`	`}`
`85`	`87`	`bestFit`