From cf2638491ea72710101387e016174036d93c55c7 Mon Sep 17 00:00:00 2001 From: Andrew Kozlov Date: Tue, 16 Oct 2018 16:24:58 +0300 Subject: [PATCH] isDotty removed from stubs #SCL-14463 --- .../dotty/lang/parser/DottyPsiCreator.scala | 2 -- .../toplevel/typedef/DottyTraitImpl.scala | 30 ------------------ .../scala/decompiler/DecompilerUtil.scala | 3 +- .../psi/stubs/ScTemplateDefinitionStub.scala | 2 -- .../ScClassDefinitionElementType.scala | 5 +-- ...NewTemplateDefinitionStubElementType.scala | 15 +++++---- .../ScObjectDefinitionElementType.scala | 5 +-- .../ScTemplateDefinitionElementType.scala | 4 --- .../ScTraitDefinitionElementType.scala | 7 ++--- .../impl/ScTemplateDefinitionStubImpl.scala | 31 +++++++++---------- 10 files changed, 35 insertions(+), 69 deletions(-) delete mode 100644 scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/psi/impl/toplevel/typedef/DottyTraitImpl.scala diff --git a/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/parser/DottyPsiCreator.scala b/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/parser/DottyPsiCreator.scala index 377fa876da6..f27ce26e18c 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/parser/DottyPsiCreator.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/parser/DottyPsiCreator.scala @@ -4,7 +4,6 @@ import com.intellij.lang.ASTNode import com.intellij.psi.PsiElement import com.intellij.psi.tree.{IElementType, TokenSet} import org.jetbrains.plugins.dotty.lang.psi.impl.base.types._ -import org.jetbrains.plugins.dotty.lang.psi.impl.toplevel.typedef.DottyTraitImpl import org.jetbrains.plugins.scala.lang.lexer.ScalaTokenTypes import org.jetbrains.plugins.scala.lang.parser.ScalaElementTypes._ import org.jetbrains.plugins.scala.lang.parser.ScalaPsiCreator @@ -16,7 +15,6 @@ object DottyPsiCreator extends ScalaPsiCreator { private val idTokenSet = TokenSet.create(REFERENCE, ScalaTokenTypes.tAND, ScalaTokenTypes.tOR) override protected def createElement(node: ASTNode, elementType: IElementType): PsiElement = elementType match { - case TRAIT_DEFINITION => new DottyTraitImpl(node) case _ => super.createElement(node, elementType) } diff --git a/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/psi/impl/toplevel/typedef/DottyTraitImpl.scala b/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/psi/impl/toplevel/typedef/DottyTraitImpl.scala deleted file mode 100644 index abc98163fbe..00000000000 --- a/scala/scala-impl/src/org/jetbrains/plugins/dotty/lang/psi/impl/toplevel/typedef/DottyTraitImpl.scala +++ /dev/null @@ -1,30 +0,0 @@ -package org.jetbrains.plugins.dotty.lang.psi.impl.toplevel.typedef - -import javax.swing.Icon - -import com.intellij.lang.ASTNode -import com.intellij.psi.PsiElement -import org.jetbrains.plugins.scala.icons.Icons -import org.jetbrains.plugins.scala.lang.parser.ScalaElementTypes -import org.jetbrains.plugins.scala.lang.psi.api.statements.{ScFunction, ScDecoratedIconOwner} -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ScClass, ScTrait} -import org.jetbrains.plugins.scala.lang.psi.impl.toplevel.typedef.ScTypeDefinitionImpl -import org.jetbrains.plugins.scala.lang.psi.stubs.ScTemplateDefinitionStub - -/** - * @author adkozlov - */ -class DottyTraitImpl private(stub: ScTemplateDefinitionStub, node: ASTNode) - extends ScTypeDefinitionImpl(stub, ScalaElementTypes.TRAIT_DEFINITION, node) with ScClass with ScTrait with ScDecoratedIconOwner { - - def this(node: ASTNode) = this(null, node) - - def this(stub: ScTemplateDefinitionStub) = this(stub, null) - - - override def getObjectClassOrTraitToken: PsiElement = super.getObjectClassOrTraitToken - - override protected def getBaseIcon(flags: Int): Icon = Icons.TRAIT - - override def getSyntheticImplicitMethod: Option[ScFunction] = None -} diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/decompiler/DecompilerUtil.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/decompiler/DecompilerUtil.scala index d7a6065044d..91f1d42ee38 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/decompiler/DecompilerUtil.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/decompiler/DecompilerUtil.scala @@ -13,9 +13,10 @@ import com.intellij.reference.SoftReference * @author ilyas */ object DecompilerUtil { + protected val LOG: Logger = Logger.getInstance("#org.jetbrains.plugins.scala.decompiler.DecompilerUtil") - val DECOMPILER_VERSION = 295 + val DECOMPILER_VERSION = 296 private val SCALA_DECOMPILER_FILE_ATTRIBUTE = new FileAttribute("_is_scala_compiled_new_key_", DECOMPILER_VERSION, true) private val SCALA_DECOMPILER_KEY = new Key[SoftReference[DecompilationResult]]("Is Scala File Key") diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/ScTemplateDefinitionStub.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/ScTemplateDefinitionStub.scala index 6c3c00151a8..d5977a5bce8 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/ScTemplateDefinitionStub.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/ScTemplateDefinitionStub.scala @@ -12,8 +12,6 @@ import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScTemplateDefin trait ScTemplateDefinitionStub extends PsiClassStub[ScTemplateDefinition] with ScMemberOrLocal { def javaQualifiedName: String - def isDotty: Boolean - def isPackageObject: Boolean def isVisibleInJava: Boolean diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScClassDefinitionElementType.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScClassDefinitionElementType.scala index 787018a987c..014a4032a1b 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScClassDefinitionElementType.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScClassDefinitionElementType.scala @@ -12,7 +12,8 @@ import org.jetbrains.plugins.scala.lang.psi.impl.toplevel.typedef.ScClassImpl * @author ilyas */ class ScClassDefinitionElementType extends ScTemplateDefinitionElementType[ScClass]("class definition") { - override def createElement(node: ASTNode): ScClass = new ScClassImpl(node) - override def createPsi(stub: ScTemplateDefinitionStub): ScClass = new ScClassImpl(stub) + override def createElement(node: ASTNode) = new ScClassImpl(node) + + override def createPsi(stub: ScTemplateDefinitionStub) = new ScClassImpl(stub) } diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScNewTemplateDefinitionStubElementType.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScNewTemplateDefinitionStubElementType.scala index dfa1efbb216..2f561ac13a5 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScNewTemplateDefinitionStubElementType.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScNewTemplateDefinitionStubElementType.scala @@ -1,17 +1,20 @@ -package org.jetbrains.plugins.scala.lang.psi.stubs.elements +package org.jetbrains.plugins.scala +package lang +package psi +package stubs +package elements import com.intellij.lang.ASTNode import org.jetbrains.plugins.scala.lang.psi.api.expr.ScNewTemplateDefinition -import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScTemplateDefinition import org.jetbrains.plugins.scala.lang.psi.impl.expr.ScNewTemplateDefinitionImpl -import org.jetbrains.plugins.scala.lang.psi.stubs.ScTemplateDefinitionStub /** * User: Alexander Podkhalyuzin * Date: 21.12.2009 */ -class ScNewTemplateDefinitionStubElementType extends ScTemplateDefinitionElementType[ScNewTemplateDefinition]("new template definition stub") { - override def createElement(node: ASTNode): ScTemplateDefinition = new ScNewTemplateDefinitionImpl(node) +final class ScNewTemplateDefinitionStubElementType extends ScTemplateDefinitionElementType[ScNewTemplateDefinition]("new template definition stub") { - override def createPsi(stub: ScTemplateDefinitionStub): ScTemplateDefinition = new ScNewTemplateDefinitionImpl(stub) + override def createElement(node: ASTNode) = new ScNewTemplateDefinitionImpl(node) + + override def createPsi(stub: ScTemplateDefinitionStub) = new ScNewTemplateDefinitionImpl(stub) } \ No newline at end of file diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScObjectDefinitionElementType.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScObjectDefinitionElementType.scala index 03f87bf67a5..6a7687f3671 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScObjectDefinitionElementType.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScObjectDefinitionElementType.scala @@ -12,7 +12,8 @@ import org.jetbrains.plugins.scala.lang.psi.impl.toplevel.typedef.ScObjectImpl * @author ilyas */ class ScObjectDefinitionElementType extends ScTemplateDefinitionElementType[ScObject]("object definition") { - override def createElement(node: ASTNode): ScObject = new ScObjectImpl(node) - override def createPsi(stub: ScTemplateDefinitionStub): ScObject = new ScObjectImpl(stub) + override def createElement(node: ASTNode) = new ScObjectImpl(node) + + override def createPsi(stub: ScTemplateDefinitionStub) = new ScObjectImpl(stub) } diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTemplateDefinitionElementType.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTemplateDefinitionElementType.scala index b52dbba4765..af96834c872 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTemplateDefinitionElementType.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTemplateDefinitionElementType.scala @@ -15,7 +15,6 @@ import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ScClass, ScObj import org.jetbrains.plugins.scala.lang.psi.stubs.impl.ScTemplateDefinitionStubImpl import org.jetbrains.plugins.scala.lang.psi.stubs.index.ScalaIndexKeys import org.jetbrains.plugins.scala.lang.refactoring.util.ScalaNamesUtil -import org.jetbrains.plugins.scala.project.ProjectExt /** * @author ilyas, alefas @@ -27,7 +26,6 @@ abstract class ScTemplateDefinitionElementType[TypeDef <: ScTemplateDefinition]( dataStream.writeName(stub.getName) dataStream.writeName(stub.getQualifiedName) dataStream.writeName(stub.javaQualifiedName) - dataStream.writeBoolean(stub.isDotty) dataStream.writeBoolean(stub.isPackageObject) dataStream.writeBoolean(stub.isScriptFileClass) dataStream.writeName(stub.getSourceFileName) @@ -47,7 +45,6 @@ abstract class ScTemplateDefinitionElementType[TypeDef <: ScTemplateDefinition]( nameRef = dataStream.readName, qualifiedNameRef = dataStream.readName, javaQualifiedNameRef = dataStream.readName, - isDotty = dataStream.readBoolean, isPackageObject = dataStream.readBoolean, isScriptFileClass = dataStream.readBoolean, sourceFileNameRef = dataStream.readName, @@ -106,7 +103,6 @@ abstract class ScTemplateDefinitionElementType[TypeDef <: ScTemplateDefinition]( nameRef = fromString(definition.name), qualifiedNameRef = fromString(definition.qualifiedName), javaQualifiedNameRef = fromString(definition.getQualifiedName), - isDotty = definition.getProject.hasDotty, isPackageObject = isPackageObject, isScriptFileClass = definition.isScriptFileClass, sourceFileNameRef = fromString(fileName), diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTraitDefinitionElementType.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTraitDefinitionElementType.scala index 74ed63b8b12..33670a0c519 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTraitDefinitionElementType.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/elements/ScTraitDefinitionElementType.scala @@ -5,7 +5,6 @@ package stubs package elements import com.intellij.lang.ASTNode -import org.jetbrains.plugins.dotty.lang.psi.impl.toplevel.typedef.DottyTraitImpl import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.ScTrait import org.jetbrains.plugins.scala.lang.psi.impl.toplevel.typedef.ScTraitImpl @@ -13,8 +12,8 @@ import org.jetbrains.plugins.scala.lang.psi.impl.toplevel.typedef.ScTraitImpl * @author ilyas */ class ScTraitDefinitionElementType extends ScTemplateDefinitionElementType[ScTrait]("trait definition") { - override def createElement(node: ASTNode): ScTrait = new ScTraitImpl(node) - override def createPsi(stub: ScTemplateDefinitionStub): ScTrait = - if (stub.isDotty) new DottyTraitImpl(stub) else new ScTraitImpl(stub) + override def createElement(node: ASTNode) = new ScTraitImpl(node) + + override def createPsi(stub: ScTemplateDefinitionStub) = new ScTraitImpl(stub) } diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/impl/ScTemplateDefinitionStubImpl.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/impl/ScTemplateDefinitionStubImpl.scala index ae56d50d22e..f6e62c5c5fd 100644 --- a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/impl/ScTemplateDefinitionStubImpl.scala +++ b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/stubs/impl/ScTemplateDefinitionStubImpl.scala @@ -14,22 +14,21 @@ import org.jetbrains.plugins.scala.lang.psi.stubs.elements.MaybeStringRefExt /** * @author ilyas */ -class ScTemplateDefinitionStubImpl(parent: StubElement[_ <: PsiElement], - elementType: IStubElementType[_ <: StubElement[_ <: PsiElement], _ <: PsiElement], - nameRef: StringRef, - private val qualifiedNameRef: StringRef, - private val javaQualifiedNameRef: StringRef, - val isDotty: Boolean, - val isPackageObject: Boolean, - val isScriptFileClass: Boolean, - private val sourceFileNameRef: StringRef, - val isDeprecated: Boolean, - val isImplicitObject: Boolean, - val isImplicitClass: Boolean, - private val javaNameRef: StringRef, - private val additionalJavaNameRef: Option[StringRef], - val isLocal: Boolean, - val isVisibleInJava: Boolean) +final class ScTemplateDefinitionStubImpl(parent: StubElement[_ <: PsiElement], + elementType: IStubElementType[_ <: StubElement[_ <: PsiElement], _ <: PsiElement], + nameRef: StringRef, + private val qualifiedNameRef: StringRef, + private val javaQualifiedNameRef: StringRef, + val isPackageObject: Boolean, + val isScriptFileClass: Boolean, + private val sourceFileNameRef: StringRef, + val isDeprecated: Boolean, + val isImplicitObject: Boolean, + val isImplicitClass: Boolean, + private val javaNameRef: StringRef, + private val additionalJavaNameRef: Option[StringRef], + val isLocal: Boolean, + val isVisibleInJava: Boolean) extends ScNamedStubBase[ScTemplateDefinition](parent, elementType, nameRef) with ScTemplateDefinitionStub { override def getQualifiedName: String = StringRef.toString(qualifiedNameRef)