Fix #2743: Fix hover problem #2744
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also add an assert in isRef to track down a stackoverflow going infinitely often through this line. Hopefully the assert will track that down.
smarter
reviewed
Jun 13, 2017
| @@ -297,7 +297,7 @@ class DottyLanguageServer extends LanguageServer | |||
| implicit val ctx = driver.currentCtx | |||
|
|
|||
| val pos = sourcePosition(driver, uri, params.getPosition) | |||
| val tp = Interactive.enclosingType(driver.openedTrees(uri), pos) | |||
| val tp = Interactive.enclosingType(driver.openedTrees.getOrElse(uri, Nil), pos) | |||
There was a problem hiding this comment.
There's many calls to openedTrees(uri) in this file, so instead of fixing it here I would change the definition of openedTrees.
|
@smarter I followed your suggestion. What about openedFiles? I thought of having that return a NoSource as default, but got pause by this comment in InteractiveDriver: So we want it to throw that exception? |
|
No that comment was more here to make me remember to decide how to handle the error cases, but it looks like I didn't :) |
|
OK, openedFiles gets a default as well. |
smarter
reviewed
Jun 13, 2017
| @@ -125,7 +125,7 @@ object Types { | |||
| def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripAnnots.stripTypeVar match { | |||
| case this1: TypeRef => | |||
| this1.info match { // see comment in Namer#typeDefSig | |||
| case TypeAlias(tp) => tp.isRef(sym) | |||
| case TypeAlias(tp) => assert((tp ne this) && (tp ne this), tp); tp.isRef(sym) | |||
There was a problem hiding this comment.
Should be this1. I think it was a merge breakage.
smarter
approved these changes
Jun 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also add an assert in isRef to track down a stackoverflow going infinitely often
through this line. Hopefully the assert will track that down.