fix: requirements plugin issue

redhat-developer · Mar 2, 2024 · 0b07d05 · 0b07d05
1 parent 6c9cea7
commit 0b07d05
Show file tree

Hide file tree

Showing 43 changed files with 97 additions and 286 deletions.
diff --git 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/...requirements/lexer/RequirementsLexer.java → ...requirements/lexer/RequirementsLexer.java b/...requirements/lexer/RequirementsLexer.java → ...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/...quirements/parser/RequirementsParser.java → ...quirements/parser/RequirementsParser.java b/...quirements/parser/RequirementsParser.java → ...quirements/parser/RequirementsParser.java
diff --git a/.../pypi/ce/requirements/psi/ExtrasList.java → ...sis/pypi/requirements/psi/ExtrasList.java b/.../pypi/ce/requirements/psi/ExtrasList.java → ...sis/pypi/requirements/psi/ExtrasList.java
diff --git a/...sis/pypi/ce/requirements/psi/NameReq.java → ...alysis/pypi/requirements/psi/NameReq.java b/...sis/pypi/ce/requirements/psi/NameReq.java → ...alysis/pypi/requirements/psi/NameReq.java
diff --git a/...i/ce/requirements/psi/NameReqComment.java → ...pypi/requirements/psi/NameReqComment.java b/...i/ce/requirements/psi/NameReqComment.java → ...pypi/requirements/psi/NameReqComment.java
diff --git a/...s/pypi/ce/requirements/psi/OtherSpec.java → ...ysis/pypi/requirements/psi/OtherSpec.java b/...s/pypi/ce/requirements/psi/OtherSpec.java → ...ysis/pypi/requirements/psi/OtherSpec.java
diff --git a/...sis/pypi/ce/requirements/psi/PkgName.java → ...alysis/pypi/requirements/psi/PkgName.java b/...sis/pypi/ce/requirements/psi/PkgName.java → ...alysis/pypi/requirements/psi/PkgName.java
diff --git a/...e/requirements/psi/RequirementsTypes.java → ...i/requirements/psi/RequirementsTypes.java b/...e/requirements/psi/RequirementsTypes.java → ...i/requirements/psi/RequirementsTypes.java
diff --git a/...ysis/pypi/ce/requirements/psi/UriReq.java → ...nalysis/pypi/requirements/psi/UriReq.java b/...ysis/pypi/ce/requirements/psi/UriReq.java → ...nalysis/pypi/requirements/psi/UriReq.java
diff --git a/.../ce/requirements/psi/VersionCmpValue.java → ...ypi/requirements/psi/VersionCmpValue.java b/.../ce/requirements/psi/VersionCmpValue.java → ...ypi/requirements/psi/VersionCmpValue.java
diff --git a/.../pypi/ce/requirements/psi/VersionOne.java → ...sis/pypi/requirements/psi/VersionOne.java b/.../pypi/ce/requirements/psi/VersionOne.java → ...sis/pypi/requirements/psi/VersionOne.java
diff --git a/...ypi/ce/requirements/psi/VersionValue.java → ...s/pypi/requirements/psi/VersionValue.java b/...ypi/ce/requirements/psi/VersionValue.java → ...s/pypi/requirements/psi/VersionValue.java
diff --git a/...pypi/ce/requirements/psi/Versionspec.java → ...is/pypi/requirements/psi/Versionspec.java b/...pypi/ce/requirements/psi/Versionspec.java → ...is/pypi/requirements/psi/Versionspec.java
diff --git a/...sis/pypi/ce/requirements/psi/Visitor.java → ...alysis/pypi/requirements/psi/Visitor.java b/...sis/pypi/ce/requirements/psi/Visitor.java → ...alysis/pypi/requirements/psi/Visitor.java
diff --git a/...requirements/psi/impl/ExtrasListImpl.java → ...requirements/psi/impl/ExtrasListImpl.java b/...requirements/psi/impl/ExtrasListImpl.java → ...requirements/psi/impl/ExtrasListImpl.java
diff --git a/...irements/psi/impl/NameReqCommentImpl.java → ...irements/psi/impl/NameReqCommentImpl.java b/...irements/psi/impl/NameReqCommentImpl.java → ...irements/psi/impl/NameReqCommentImpl.java
diff --git a/...ce/requirements/psi/impl/NameReqImpl.java → ...pi/requirements/psi/impl/NameReqImpl.java b/...ce/requirements/psi/impl/NameReqImpl.java → ...pi/requirements/psi/impl/NameReqImpl.java
diff --git a/.../requirements/psi/impl/OtherSpecImpl.java → .../requirements/psi/impl/OtherSpecImpl.java b/.../requirements/psi/impl/OtherSpecImpl.java → .../requirements/psi/impl/OtherSpecImpl.java
diff --git a/...ce/requirements/psi/impl/PkgNameImpl.java → ...pi/requirements/psi/impl/PkgNameImpl.java b/...ce/requirements/psi/impl/PkgNameImpl.java → ...pi/requirements/psi/impl/PkgNameImpl.java
diff --git a/.../ce/requirements/psi/impl/UriReqImpl.java → ...ypi/requirements/psi/impl/UriReqImpl.java b/.../ce/requirements/psi/impl/UriReqImpl.java → ...ypi/requirements/psi/impl/UriReqImpl.java
diff --git a/...rements/psi/impl/VersionCmpValueImpl.java → ...rements/psi/impl/VersionCmpValueImpl.java b/...rements/psi/impl/VersionCmpValueImpl.java → ...rements/psi/impl/VersionCmpValueImpl.java
diff --git a/...requirements/psi/impl/VersionOneImpl.java → ...requirements/psi/impl/VersionOneImpl.java b/...requirements/psi/impl/VersionOneImpl.java → ...requirements/psi/impl/VersionOneImpl.java
diff --git a/...quirements/psi/impl/VersionValueImpl.java → ...quirements/psi/impl/VersionValueImpl.java b/...quirements/psi/impl/VersionValueImpl.java → ...quirements/psi/impl/VersionValueImpl.java
diff --git a/...equirements/psi/impl/VersionspecImpl.java → ...equirements/psi/impl/VersionspecImpl.java b/...equirements/psi/impl/VersionspecImpl.java → ...equirements/psi/impl/VersionspecImpl.java
diff --git 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/...onentanalysis/pypi/ce/PipCAAnnotator.java → ...omponentanalysis/pypi/PipCAAnnotator.java b/...onentanalysis/pypi/ce/PipCAAnnotator.java → ...omponentanalysis/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/...nalysis/pypi/ce/PipCAIntentionAction.java → ...ntanalysis/pypi/PipCAIntentionAction.java b/...nalysis/pypi/ce/PipCAIntentionAction.java → ...ntanalysis/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;