Migrate semantic highlighting to YARP #1000
Merged
Conversation
This file contains 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
Co-authored-by: Alexandre Terrasa <[email protected]>
vinistock
force-pushed
the
vs/semantic_highlighting_yarp
branch
from
9e46e6f
to
2f8eb3b
Compare
KaanOzkan
approved these changes
Sep 14, 2023
andyw8
reviewed
Sep 14, 2023
| attr_reader :parent | ||
|
|
||
| sig { params(parent: T.nilable(ParameterScope)).void } | ||
| def initialize(parent = nil) |
There was a problem hiding this comment.
(nit) Since the only places where we don't pass an argument is in the tests, might it simplify things a little to make this a required parameter?
There was a problem hiding this comment.
We don't pass an argument when we instantiate it for the first time in SemanticHighlighting#initialize. It would also not be correct to always require a parent given that the global scope doesn't have one.
andyw8
reviewed
Sep 14, 2023
| sig { params(name: T.any(Symbol, String)).returns(T::Boolean) } | ||
| def parameter?(name) | ||
| sym = name.to_sym | ||
| @parameters.include?(sym) || ([email protected]? && @parent.parameter?(sym)) |
There was a problem hiding this comment.
Suggested change
| @parameters.include?(sym) || (!@parent.nil? && @parent.parameter?(sym)) | |
| @parameters.include?(sym) || @parent&.parameter?(sym) |
There was a problem hiding this comment.
That fails typechecking because instead of returning T::Boolean it returns T.nilable(T::Boolean).
andyw8
reviewed
Sep 14, 2023
| # For each capture name we find in the regexp, look for a local in the current_scope | ||
| Regexp.new(content, Regexp::FIXEDENCODING).names.each do |name| | ||
| # The +3 is to compensate for the "(?<" part of the capture name | ||
| capture_name_offset = T.must(content.index("(?<#{name}>")) + 3 |
There was a problem hiding this comment.
Not a blocker, but it seems there are some other ways of representing named captures:
There was a problem hiding this comment.
I think the \k<> is a backreference to the named capture and not another way to create named captures. The idea is for you to do this
/(?<group>(something|other))(\k<group>)/
# ^ this captures group ^ this references the captured group
andyw8
reviewed
Sep 14, 2023
| @@ -96,15 +96,12 @@ def test_encoded_modifiers_with_some_modifiers | |||
| private | |||
|
|
|||
| def stub_token(start_line, start_column, length, type, modifier) | |||
| location = YARP::Location.new("", 123, 123) | |||
| location.expects(:start_line).returns(start_line).at_least_once | |||
There was a problem hiding this comment.
(nit) Isn't .at_least_once redundant? An expectation would fail if never triggered.
There was a problem hiding this comment.
It gets triggered more than once, so this is necessary. By default, Mocha fails if an expectation gets hit twice.
andyw8
approved these changes
Sep 14, 2023
This was referenced Sep 14, 2023
vinistock
added a commit
that referenced
this pull request
Sep 15, 2023
Co-authored-by: Alexandre Terrasa <[email protected]>
vinistock
added a commit
that referenced
this pull request
Sep 18, 2023
Co-authored-by: Alexandre Terrasa <[email protected]>
vinistock
added a commit
that referenced
this pull request
Sep 19, 2023
* Temporarily disable .github/workflows/lsp_check.yml * Temporarily disable some tests * Preparation for YARP migration * Migrate DocumentSymbol request to YARP * Migrate Hover request to YARP * Migrate PathCompletion request to YARP * Migrate Sorbet request to YARP * Migrate InlayHints request to YARP * Migrate ShowSyntaxTree request to YARP * Migrate SelectionRange request to YARP * Migrate Definition request to YARP * Migrate Diagnostics request to YARP * Migrate CodeActionResolve request to YARP * Update selection ranges expectations * Fix rebase discrepancies * Add YARP RBI annotations (#978) * Migrate code lens to yarp (#979) Migrate CodeLens to YARP * Update `SERVER_EXTENSIONS.md` for YARP (#984) Co-authored-by: Andy Waite <[email protected]> * Update text references from Syntax Tree to YARP (#986) Co-authored-by: Andy Waite <[email protected]> * Fix rebase discrepancies * Migrate folding range to YARP (#980) * Fix rebase discrepancies 3 * Migrate semantic highlighting to YARP (#1000) Co-authored-by: Alexandre Terrasa <[email protected]> * Migrate document highlight to YARP (#1005) * Simplify block locals handling in semantic highlighting (#1011) * Fix latest breaking changes * Make folding range a listener (#1013) * Migrate DocumentLink request to YARP (#982) * Migrate DocumentLink to YARP * Only parse comments where needed * Fix type * PR feedback * Fix argument order * Re-enable DocumentLink integration test --------- Co-authored-by: Andy Waite <[email protected]> * Re-enable CI (#1022) * Re-generate YARP RBIs * Re-enable tests * Fix typechecking errors * Use locations for creating document symbol entries --------- Co-authored-by: Andy Waite <[email protected]> Co-authored-by: Andy Waite <[email protected]> Co-authored-by: Alexandre Terrasa <[email protected]>
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.
Motivation
Closes #884
Migrate semantic highlighting to YARP.
Implementation
This PR adds a parameter scope implementation. This is a much simpler implementation than the scopes we contributed to SyntaxTree. It only tracks the parameters for the current scope and nothing else - which we use to highlight parameters consistently.
Other than that, the rest is just adding the necessary visits and changing node types.
Automated Tests
Most tests didn't need any changes, but some new tokens are now being pushed in a few cases. For example,
<<used to not be considered aCallNode, but it now is and so we get a token for that.