Add static modifier for associated functions
#6472
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
added 2 commits
November 4, 2020 20:08
…self refactor logic into code_model.rs
lunacookies
reviewed
Nov 5, 2020
crates/hir/src/code_model.rs
Outdated
|
|
||
| /// whether this function is associated with some trait/impl | ||
| pub fn is_associated(self, db: &dyn HirDatabase) -> bool { | ||
| if let Some(_) = self.self_param(db) { |
Contributor
There was a problem hiding this comment.
This could be
if self.self_param(db).is_some()…self refactor logic into code_model.rs
Veykril
reviewed
Nov 5, 2020
…self refactor logic into code_model.rs address comments
matklad
reviewed
Nov 7, 2020
| if func.is_unsafe(db) { | ||
| h |= HighlightModifier::Unsafe; | ||
| } | ||
| if func.is_associated(db) { |
Contributor
There was a problem hiding this comment.
Let's use something like this instead:
Suggested change
| if func.is_associated(db) { | |
| if func.is_assoc_item(db) && func.self_param(db).is_none() { |
Contributor
There was a problem hiding this comment.
Oh dear, that was one confusing comment, sorry.
What I meant to say is that we already have as_assoc_item function we can use here, instead of implementing a new is_assoc_item:
added 2 commits
November 8, 2020 00:01
…self refactor logic into code_model.rs address comments
…self refactor logic into code_model.rs address comments
Contributor
|
bors r+ Thanks! |
Contributor
Author
|
Thanks for accepting! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Adds static semantic token modifier to associated functions, resolves #6194
Info
Changes
is_associatedto code_model::Function. This basically gets the source from the ast, and checks whether the enclosing scope is an impl or trait.staticto HighlightModifiersTests
cargo test