Implement @static sip. #1155
Merged
Implement @static sip. #1155
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
This pull request implements most of machinery needed for scala/docs.scala-lang#491 Only 3-rd check is not implemented by this commit. I propose to get this in faster to fix scala#1149
| @@ -337,6 +337,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { | |||
| else if (prefixIsElidable(tp)) Ident(tp) | |||
| else if (tp.symbol.is(Module) && ctx.owner.isContainedIn(tp.symbol.moduleClass)) | |||
| followOuterLinks(This(tp.symbol.moduleClass.asClass)) | |||
| else if (tp.symbol hasAnnotation defn.ScalaStaticAnnot) | |||
| Ident(tp) | |||
| /** Add given annotation to the annotations of this denotation */ | ||
| final def addAnnotation(annot: ClassSymbol)(implicit ctx: Context): Unit = | ||
| addAnnotation(ConcreteAnnotation(tpd.ref(annot))) | ||
|
|
There was a problem hiding this comment.
I don't think you need that here. Annotation already contains a bunch of overloaded apply methods to create annotations; we should not add more overloadings in other places because then there are two places to look for the right variant instead of one. You can get what you want already by writing
addAnnotation(Annotation(cls, Nil))
If one objects to the Nil, one can add another variant of apply to Annotation.
There was a problem hiding this comment.
symbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)))
seems like too much repetition to me, but if you insist, I'll make the change.
Implemented by checking that tree is allowed to access the static member and all the members on the path to it. Needed as typer has a tendency to desugar calls into series of selections&calls to This.
| @@ -91,6 +91,7 @@ class LazyVals extends MiniPhaseTransform with IdentityDenotTransformer with Nee | |||
| appendOffsetDefs.get(cls) match { | |||
| case None => template | |||
| case Some(data) => | |||
| data.defs.foreach(_.symbol.addAnnotation(defn.ScalaStaticAnnot)) | |||
There was a problem hiding this comment.
To avoid the repetition, why not define in LazyVals:
def staticAnnot = Annotation(defn.ScalaStaticAnnot, Nil)
|
LGTM |
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.
This pull request implements most of machinery needed for
scala/docs.scala-lang#491
Only 3-rd check is not implemented by this commit. I propose to get this in
faster to fix #1149