Merge pull request #4635 from dotty-staging/harden-ide-11

odersky · web-flow · commit 3d3f5b632dde · 2018-06-11T14:05:55.000+02:00
Harden IDE
diff --git a/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala b/language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala
@@ -328,7 +328,9 @@ class DottyLanguageServer extends LanguageServer
     if (sym == NoSymbol) Nil.asJava
     else {
       val refs = Interactive.namedTrees(uriTrees, Include.references | Include.overriding, sym)
-      refs.map(ref => new DocumentHighlight(range(ref.namePos), DocumentHighlightKind.Read)).asJava
+      ( for (ref <- refs if ref.namePos.exists)
+        yield new DocumentHighlight(range(ref.namePos), DocumentHighlightKind.Read)
+      ).asJava
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,9 @@ class DottyLanguageServer extends LanguageServer`
`328`	`328`	`if (sym == NoSymbol) Nil.asJava`
`329`	`329`	`else {`
`330`	`330`	`val refs = Interactive.namedTrees(uriTrees, Include.references \| Include.overriding, sym)`
`331`		`- refs.map(ref => new DocumentHighlight(range(ref.namePos), DocumentHighlightKind.Read)).asJava`
	`331`	`+ ( for (ref <- refs if ref.namePos.exists)`
	`332`	`+ yield new DocumentHighlight(range(ref.namePos), DocumentHighlightKind.Read)`
	`333`	`+ ).asJava`
`332`	`334`	`}`
`333`	`335`	`}`
`334`	`336`