improvement: Rework IndexedContext to reuse the previously calculated scopes #22898
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
|
I wonder if this strategy helps #22430 (which I haven't returned to yet) Edit: I guess only in the sense of "moral support". |
|
I think I am actually doing it all wrong and might be possible that IndexedContext is not really needed 😅 |
tgodzik
force-pushed
the
fix-slow
branch
2 times, most recently
from
3e69d9e to
21aa3b8
Compare
tgodzik
force-pushed
the
fix-slow
branch
4 times, most recently
from
d27ca2c to
376f628
Compare
tgodzik
changed the title
… scopes It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.
tgodzik
commented
Apr 17, 2025
| @@ -48,6 +48,16 @@ case class Completion(label: String, description: String, symbols: List[Symbol]) | |||
|
|
|||
| object Completion: | |||
|
|
|||
| def scopeContext(pos: SourcePosition)(using Context): CompletionResult = | |||
There was a problem hiding this comment.
Ideally this would get deduplicated with normal rawCompletions being invoked, but I will try to do it as a separate step afterwards.
| @Test def `sealed-conflict` = | ||
| check( | ||
| """ | ||
| |object A { | ||
| | val e: Either[Int, String] = ??? | ||
| | type Left = String |
There was a problem hiding this comment.
type val actually fine here, but val causes an error
| @@ -655,7 +655,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite { | |||
| | val y/*: S<<scala/collection/Set#>>[Char<<scala/Char#>>]*/ = f | |||
| | ??? | |||
| | } | |||
| | val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<scala/Predef.String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a')) | |||
| | val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a')) | |||
There was a problem hiding this comment.
This was inconsistent previously
kasiaMarek
reviewed
Apr 22, 2025
presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
Outdated
Show resolved
Hide resolved
presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
Outdated
Show resolved
Hide resolved
presentation-compiler/src/main/dotty/tools/pc/IndexedContext.scala
Outdated
Show resolved
Hide resolved
presentation-compiler/src/main/dotty/tools/pc/completions/NamedArgCompletions.scala
Show resolved
Hide resolved
| if !id.symbol.is(Synthetic) && !id.symbol.is(Implicit) => | ||
| symbols + tree.symbol | ||
| case sel: Select => | ||
| indexedContext.lookupSym(sel.symbol) match |
There was a problem hiding this comment.
I'm questioning this right now. Shouldn't we actually just collect the symbol of the qualifier? (Sort of a side comment not connected to the PR)
There was a problem hiding this comment.
This was causing the + method etc. to be reported as conflicting, which was not really a problem.
… conflciting constructors
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 28, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 28, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now. [Cherry-picked 9d90ff5][modified]
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 29, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 29, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now. [Cherry-picked 9d90ff5][modified]
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 30, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.
tgodzik
added a commit
to scala/scala3-lts
that referenced
this pull request
Apr 30, 2025
… scopes (scala#22898) It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now. [Cherry-picked 9d90ff5][modified]
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.
It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does.
There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.