diff --git a/build.gradle b/build.gradle index 7065d5e..ee02f88 100644 --- a/build.gradle +++ b/build.gradle @@ -40,9 +40,7 @@ intellij { version = ideaVersion //for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases pluginName = 'org.jboss.tools.intellij.analytics' plugins = ['com.redhat.devtools.intellij.telemetry:1.1.0.52', - "org.jetbrains.plugins.go:211.6693.111", - "PythonCore:211.6693.111", - "ru.meanmail.plugin.requirements:2021.4-211"] + "org.jetbrains.plugins.go:211.6693.111"] updateSinceUntilBuild = false } diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexer.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexer.java similarity index 99% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexer.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexer.java index 26cb03c..bc1c814 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexer.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexer.java @@ -1,14 +1,14 @@ // Generated by JFlex 1.9.1 http://jflex.de/ (tweaked for IntelliJ platform) // source: Requirements.flex -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lexer; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; import static com.intellij.psi.TokenType.BAD_CHARACTER; import static com.intellij.psi.TokenType.WHITE_SPACE; -import static org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsTypes.*; +import static org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTypes.*; public class RequirementsLexer implements FlexLexer { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/parser/RequirementsParser.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/parser/RequirementsParser.java similarity index 98% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/parser/RequirementsParser.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/parser/RequirementsParser.java index a7356f7..cb5a8f6 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/parser/RequirementsParser.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/parser/RequirementsParser.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.parser; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.parser; import com.intellij.lang.ASTNode; import com.intellij.lang.LightPsiParser; @@ -9,7 +9,7 @@ import com.intellij.psi.tree.IElementType; import static com.intellij.lang.parser.GeneratedParserUtilBase.*; -import static org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsTypes.*; +import static org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTypes.*; @SuppressWarnings({"SimplifiableIfStatement", "UnusedAssignment"}) public class RequirementsParser implements PsiParser, LightPsiParser { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/ExtrasList.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/ExtrasList.java similarity index 66% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/ExtrasList.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/ExtrasList.java index 5ce2615..b23ab69 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/ExtrasList.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/ExtrasList.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReq.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReq.java similarity index 84% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReq.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReq.java index c5d39ee..f988f0d 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReq.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReq.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReqComment.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReqComment.java similarity index 66% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReqComment.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReqComment.java index 6bb2d1e..300ae39 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/NameReqComment.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/NameReqComment.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/OtherSpec.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/OtherSpec.java similarity index 66% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/OtherSpec.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/OtherSpec.java index 18b9ba5..1660eff 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/OtherSpec.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/OtherSpec.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/PkgName.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/PkgName.java similarity index 65% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/PkgName.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/PkgName.java index 30bc674..8eac400 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/PkgName.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/PkgName.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTypes.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTypes.java similarity index 95% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTypes.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTypes.java index 7d07d5d..90c1bd8 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTypes.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTypes.java @@ -1,10 +1,10 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl.*; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl.*; public interface RequirementsTypes { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/UriReq.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/UriReq.java similarity index 77% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/UriReq.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/UriReq.java index 1a77750..025ea8c 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/UriReq.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/UriReq.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionCmpValue.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionCmpValue.java similarity index 67% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionCmpValue.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionCmpValue.java index d6be704..5607f4e 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionCmpValue.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionCmpValue.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionOne.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionOne.java similarity index 79% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionOne.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionOne.java index 1481b72..59ff257 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionOne.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionOne.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionValue.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionValue.java similarity index 66% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionValue.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionValue.java index fc1ddd8..aaf0acd 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/VersionValue.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/VersionValue.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Versionspec.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Versionspec.java similarity index 77% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Versionspec.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Versionspec.java index 687cfc1..da36083 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Versionspec.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Versionspec.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Visitor.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Visitor.java similarity index 93% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Visitor.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Visitor.java index 8a360c8..65b83fe 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/Visitor.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/Visitor.java @@ -1,5 +1,5 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/ExtrasListImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/ExtrasListImpl.java similarity index 71% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/ExtrasListImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/ExtrasListImpl.java index 6c8aeb9..87db6bf 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/ExtrasListImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/ExtrasListImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.ExtrasList; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.ExtrasList; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class ExtrasListImpl extends ASTWrapperPsiElement implements ExtrasList { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqCommentImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqCommentImpl.java similarity index 72% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqCommentImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqCommentImpl.java index 82d20f6..4b41f86 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqCommentImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqCommentImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.NameReqComment; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReqComment; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class NameReqCommentImpl extends ASTWrapperPsiElement implements NameReqComment { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqImpl.java similarity index 87% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqImpl.java index fc84960..144a470 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/NameReqImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/NameReqImpl.java @@ -1,10 +1,10 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.*; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/OtherSpecImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/OtherSpecImpl.java similarity index 71% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/OtherSpecImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/OtherSpecImpl.java index b8801ba..28bcb42 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/OtherSpecImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/OtherSpecImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.OtherSpec; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.OtherSpec; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class OtherSpecImpl extends ASTWrapperPsiElement implements OtherSpec { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/PkgNameImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/PkgNameImpl.java similarity index 71% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/PkgNameImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/PkgNameImpl.java index 579defe..40dbda0 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/PkgNameImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/PkgNameImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.PkgName; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.PkgName; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class PkgNameImpl extends ASTWrapperPsiElement implements PkgName { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/UriReqImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/UriReqImpl.java similarity index 68% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/UriReqImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/UriReqImpl.java index a131157..0f1a3cf 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/UriReqImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/UriReqImpl.java @@ -1,13 +1,13 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.ExtrasList; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.PkgName; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.UriReq; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.ExtrasList; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.PkgName; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.UriReq; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionCmpValueImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionCmpValueImpl.java similarity index 72% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionCmpValueImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionCmpValueImpl.java index a5b7e3c..eb4e522 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionCmpValueImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionCmpValueImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionCmpValue; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionCmpValue; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class VersionCmpValueImpl extends ASTWrapperPsiElement implements VersionCmpValue { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionOneImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionOneImpl.java similarity index 67% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionOneImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionOneImpl.java index 5c54a67..0d82b1f 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionOneImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionOneImpl.java @@ -1,13 +1,13 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionCmpValue; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionOne; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionValue; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionCmpValue; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionOne; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionValue; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class VersionOneImpl extends ASTWrapperPsiElement implements VersionOne { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionValueImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionValueImpl.java similarity index 72% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionValueImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionValueImpl.java index 7b0eaa6..c1a289f 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionValueImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionValueImpl.java @@ -1,11 +1,11 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionValue; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionValue; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; public class VersionValueImpl extends ASTWrapperPsiElement implements VersionValue { diff --git a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionspecImpl.java b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionspecImpl.java similarity index 71% rename from src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionspecImpl.java rename to src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionspecImpl.java index f387f13..0c4d31c 100644 --- a/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/impl/VersionspecImpl.java +++ b/src/main/gen/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/impl/VersionspecImpl.java @@ -1,13 +1,13 @@ // This is a generated file. Not intended for manual editing. -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.util.PsiTreeUtil; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.VersionOne; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Versionspec; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Visitor; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.VersionOne; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Versionspec; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Visitor; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java index 63f16ea..c11dd7b 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/CAIntentionAction.java @@ -130,7 +130,6 @@ static boolean thereAreNoIssues(DependencyReport dependency) { return dependency.getIssues() == null || dependency.getIssues().size() == 0; } - //TODO private static @NotNull String getQuickFixText(VulnerabilitySource source, DependencyReport dependency) { String text=""; if(thereAreNoIssues(dependency) && thereIsRecommendation(dependency)) @@ -147,7 +146,6 @@ static boolean thereAreNoIssues(DependencyReport dependency) { return text; } - //TODO static boolean isQuickFixAvailable(DependencyReport dependency) { boolean result=false; if(thereAreNoIssues(dependency)) diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java similarity index 90% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAAnnotator.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java index be91333..b9b0a61 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAAnnotator.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java @@ -9,15 +9,14 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce; +package org.jboss.tools.intellij.componentanalysis.pypi; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.redhat.exhort.api.DependencyReport; import org.jboss.tools.intellij.componentanalysis.*; -import org.jboss.tools.intellij.componentanalysis.pypi.PipCAInspection; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.NameReq; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.NameReqComment; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReq; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReqComment; import java.util.*; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAIntentionAction.java similarity index 84% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAIntentionAction.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAIntentionAction.java index 38c000f..8b50b1b 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/PipCAIntentionAction.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAIntentionAction.java @@ -9,7 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce; +package org.jboss.tools.intellij.componentanalysis.pypi; import com.intellij.codeInsight.intention.FileModifier; import com.intellij.openapi.editor.Editor; @@ -20,10 +20,10 @@ import com.redhat.exhort.api.DependencyReport; import org.jboss.tools.intellij.componentanalysis.CAIntentionAction; import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.filetype.RequirementsFileType; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.NameReq; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsFile; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.Versionspec; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.filetype.RequirementsFileType; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.NameReq; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsFile; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.Versionspec; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAAnnotator.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAAnnotator.java deleted file mode 100644 index 21485c9..0000000 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAAnnotator.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v2.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v20.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.intellij.componentanalysis.pypi.pro; - -import com.intellij.psi.PsiComment; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.impl.source.tree.LeafPsiElement; -import com.redhat.exhort.api.DependencyReport; -import org.jboss.tools.intellij.componentanalysis.*; -import org.jboss.tools.intellij.componentanalysis.pypi.PipCAInspection; -import org.jetbrains.annotations.Nullable; -import ru.meanmail.psi.NameReq; -import ru.meanmail.psi.UrlReq; - -import java.util.*; - -public class PipCAAnnotator extends CAAnnotator { - @Override - protected String getInspectionShortName() { - return PipCAInspection.SHORT_NAME; - } - - @Override - protected Map> getDependencies(PsiFile file) { - if ("requirements.txt".equals(file.getName())) { - Map> resultMap = new HashMap<>(); - - PsiElement[] children = file.getChildren(); - int i = 0; - - while (i < children.length) { - PsiElement child = children[i]; - Dependency dep = getDependency(child); - - if (dep != null) { - while (++i <= children.length) { - if (i == children.length) { - resultMap.computeIfAbsent(dep, k -> new LinkedList<>()).add(child); - break; - } - - PsiElement next = children[i]; - if (next instanceof PsiComment) { - PsiComment c = (PsiComment) next; - String comment = c.getText().trim(); - if (!comment.isEmpty() && - '#' == comment.charAt(0) && - "exhortignore".equals(comment.substring(1).trim())) { - break; - } - } else if (next instanceof LeafPsiElement) { - LeafPsiElement ele = (LeafPsiElement) next; - if ("RequirementsTokenType.EOL".equals(ele.getElementType().toString())) { - resultMap.computeIfAbsent(dep, k -> new LinkedList<>()).add(child); - break; - } - } - } - } - - i++; - } - - return resultMap; - } - return Collections.emptyMap(); - } - - @Override - protected CAIntentionAction createQuickFix(PsiElement element, VulnerabilitySource source, DependencyReport report) { - return new PipCAIntentionAction(element, source, report); - } - - @Override - protected CAUpdateManifestIntentionAction patchManifest(PsiElement element, DependencyReport report) { - return null; - } - - @Override - protected boolean isQuickFixApplicable(PsiElement element) { - return element instanceof NameReq && ((NameReq) element).getVersionspec() != null; - } - - @Nullable - private static Dependency getDependency(PsiElement child) { - Dependency dep = null; - - if (child instanceof NameReq) { - NameReq nameReq = (NameReq) child; - String name = nameReq.getName().getText().toLowerCase(); - String version = nameReq.getVersionspec() != null ? nameReq.getVersionspec().getText() : null; - dep = new Dependency("pypi", null, name, version); - } else if (child instanceof UrlReq) { - UrlReq urlReq = (UrlReq) child; - String name = urlReq.getName().getText().toLowerCase(); - String version = urlReq.getUrlspec().getText(); - dep = new Dependency("pypi", null, name, version); - } - return dep; - } -} diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAIntentionAction.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAIntentionAction.java deleted file mode 100644 index d39f0cd..0000000 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/pro/PipCAIntentionAction.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2023 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v2.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v20.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.intellij.componentanalysis.pypi.pro; - -import com.intellij.codeInsight.intention.FileModifier; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiFileFactory; -import com.redhat.exhort.api.DependencyReport; -import org.jboss.tools.intellij.componentanalysis.CAIntentionAction; -import org.jboss.tools.intellij.componentanalysis.VulnerabilitySource; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import ru.meanmail.fileTypes.RequirementsFileType; -import ru.meanmail.psi.NameReq; -import ru.meanmail.psi.RequirementsFile; -import ru.meanmail.psi.Versionspec; - -public final class PipCAIntentionAction extends CAIntentionAction { - PipCAIntentionAction(PsiElement element, VulnerabilitySource source, DependencyReport report) { - super(element, source, report); - } - - @Override - protected void updateVersion(@NotNull Project project, Editor editor, PsiFile file, String version) { - Versionspec versionspec = ((NameReq) element).getVersionspec(); - if (versionspec != null) { - RequirementsFile dummyFile = (RequirementsFile) PsiFileFactory.getInstance(project).createFileFromText( - "dummy-requirements.txt", RequirementsFileType.INSTANCE, - ((NameReq) element).getName().getText() + " == " + version); - NameReq newNameReq = (NameReq) dummyFile.getFirstChild(); - if (newNameReq.getVersionspec() != null) { - versionspec.replace(newNameReq.getVersionspec()); - } - } - } - - @Override - protected @Nullable FileModifier createCAIntentionActionInCopy(PsiElement element) { - return new PipCAIntentionAction(element, this.source, this.report); - } - - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { - return file != null && "requirements.txt".equals(file.getName()); - } -} diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.bnf b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.bnf similarity index 77% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.bnf rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.bnf index a1ba9ea..7eab345 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.bnf +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.bnf @@ -1,17 +1,17 @@ { - parserClass="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.parser.RequirementsParser" + parserClass="org.jboss.tools.intellij.componentanalysis.pypi.requirements.parser.RequirementsParser" parserUtilClass="com.intellij.lang.parser.GeneratedParserUtilBase" extends="com.intellij.extapi.psi.ASTWrapperPsiElement" psiClassPrefix="" psiImplClassSuffix="Impl" - psiPackage="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi" - psiImplPackage="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.impl" + psiPackage="org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi" + psiImplPackage="org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.impl" - elementTypeHolderClass="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsTypes" - elementTypeClass="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsElementType" - tokenTypeClass="org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsTokenType" + elementTypeHolderClass="org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTypes" + elementTypeClass="org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsElementType" + tokenTypeClass="org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTokenType" } file ::= line* diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.flex b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.flex similarity index 93% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.flex rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.flex index 8e58a30..8081370 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/Requirements.flex +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/Requirements.flex @@ -1,11 +1,11 @@ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lexer; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; import static com.intellij.psi.TokenType.BAD_CHARACTER; import static com.intellij.psi.TokenType.WHITE_SPACE; -import static org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi.RequirementsTypes.*; +import static org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi.RequirementsTypes.*; %% diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/filetype/RequirementsFileType.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/filetype/RequirementsFileType.java similarity index 89% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/filetype/RequirementsFileType.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/filetype/RequirementsFileType.java index 4f8d6f1..9983f7d 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/filetype/RequirementsFileType.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/filetype/RequirementsFileType.java @@ -10,12 +10,12 @@ ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.filetype; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.filetype; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.util.NlsSafe; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang.RequirementsLanguage; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang.RequirementsLanguage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lang/RequirementsLanguage.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lang/RequirementsLanguage.java similarity index 90% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lang/RequirementsLanguage.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lang/RequirementsLanguage.java index 8351b98..7937293 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lang/RequirementsLanguage.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lang/RequirementsLanguage.java @@ -9,7 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang; import com.intellij.lang.Language; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexerAdapter.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexerAdapter.java similarity index 90% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexerAdapter.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexerAdapter.java index d36ae3b..8410b17 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/lexer/RequirementsLexerAdapter.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/lexer/RequirementsLexerAdapter.java @@ -9,7 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lexer; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.lexer; import com.intellij.lexer.FlexAdapter; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsElementType.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsElementType.java similarity index 82% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsElementType.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsElementType.java index 99b1ed2..455c08d 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsElementType.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsElementType.java @@ -9,10 +9,10 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.tree.IElementType; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang.RequirementsLanguage; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang.RequirementsLanguage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsFile.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsFile.java similarity index 79% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsFile.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsFile.java index 0292163..d84bac2 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsFile.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsFile.java @@ -9,13 +9,13 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.extapi.psi.PsiFileBase; import com.intellij.openapi.fileTypes.FileType; import com.intellij.psi.FileViewProvider; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.filetype.RequirementsFileType; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang.RequirementsLanguage; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.filetype.RequirementsFileType; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang.RequirementsLanguage; import org.jetbrains.annotations.NotNull; public class RequirementsFile extends PsiFileBase { diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsParserDefinition.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsParserDefinition.java similarity index 84% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsParserDefinition.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsParserDefinition.java index 3dde333..ea6a9db 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsParserDefinition.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsParserDefinition.java @@ -9,7 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.lang.ASTNode; import com.intellij.lang.ParserDefinition; @@ -21,9 +21,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang.RequirementsLanguage; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lexer.RequirementsLexerAdapter; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.parser.RequirementsParser; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang.RequirementsLanguage; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lexer.RequirementsLexerAdapter; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.parser.RequirementsParser; import org.jetbrains.annotations.NotNull; public class RequirementsParserDefinition implements ParserDefinition { diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenSets.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenSets.java similarity index 89% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenSets.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenSets.java index bccb1a2..77ab05f 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenSets.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenSets.java @@ -9,7 +9,7 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.tree.TokenSet; diff --git a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenType.java b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenType.java similarity index 84% rename from src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenType.java rename to src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenType.java index c6a9df8..3a9cec2 100644 --- a/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/ce/requirements/psi/RequirementsTokenType.java +++ b/src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/requirements/psi/RequirementsTokenType.java @@ -9,10 +9,10 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.psi; +package org.jboss.tools.intellij.componentanalysis.pypi.requirements.psi; import com.intellij.psi.tree.IElementType; -import org.jboss.tools.intellij.componentanalysis.pypi.ce.requirements.lang.RequirementsLanguage; +import org.jboss.tools.intellij.componentanalysis.pypi.requirements.lang.RequirementsLanguage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/src/main/resources/META-INF/pip-ce.xml b/src/main/resources/META-INF/pip-ce.xml deleted file mode 100644 index 5993e07..0000000 --- a/src/main/resources/META-INF/pip-ce.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/META-INF/pip-pro.xml b/src/main/resources/META-INF/pip-pro.xml deleted file mode 100644 index c4f05a9..0000000 --- a/src/main/resources/META-INF/pip-pro.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index fa72773..0079395 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -381,8 +381,6 @@ com.intellij.modules.lang com.redhat.devtools.intellij.telemetry org.jetbrains.plugins.go - PythonCore - ru.meanmail.plugin.requirements @@ -410,6 +408,19 @@ + + + + +