Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix inspection errors on startup #354

Merged
merged 1 commit into from
May 31, 2023
Merged

Fix inspection errors on startup #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/jfrog/ide/idea/inspections/NpmInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.intellij.psi.PsiElementVisitor;
import com.jfrog.ide.idea.inspections.upgradeversion.NpmUpgradeVersion;
import com.jfrog.ide.idea.inspections.upgradeversion.UpgradeVersion;
import com.jfrog.ide.idea.scan.NpmScanner;
import com.jfrog.ide.idea.scan.ScanManager;
import com.jfrog.ide.idea.scan.ScannerBase;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -54,10 +55,15 @@ boolean isDependency(PsiElement element) {
ScannerBase getScanner(Project project, String path) {
return ScanManager.getScanners(project).stream()
.filter(manager -> StringUtils.equals(manager.getProjectPath(), path))
.filter(this::isMatchingScanner)
.findAny()
.orElse(null);
}

boolean isMatchingScanner(ScannerBase scanner) {
return scanner instanceof NpmScanner;
}

@Override
String createComponentName(PsiElement element) {
return StringUtils.unwrap(element.getFirstChild().getText(), "\"");
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/jfrog/ide/idea/inspections/YarnInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.jfrog.ide.idea.inspections.upgradeversion.UpgradeVersion;
import com.jfrog.ide.idea.inspections.upgradeversion.YarnUpgradeVersion;
import com.jfrog.ide.idea.scan.ScannerBase;
import com.jfrog.ide.idea.scan.YarnScanner;

import java.util.Collection;

Expand All @@ -10,6 +12,11 @@
* @author michaels
*/
public class YarnInspection extends NpmInspection {
@Override
boolean isMatchingScanner(ScannerBase scanner) {
return scanner instanceof YarnScanner;
}

@Override
UpgradeVersion getUpgradeVersion(String componentName, String fixVersion, Collection<String> issue) {
return new YarnUpgradeVersion(componentName, fixVersion, issue);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jfrog/ide/idea/scan/ScannerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ public Set<Path> getProjectPaths() {
}

void runInspections() {
ApplicationManager.getApplication().invokeLater(() -> {
DumbService.getInstance(project).smartInvokeLater(() -> {
PsiFile[] projectDescriptors = getProjectDescriptors();
if (ArrayUtils.isEmpty(projectDescriptors)) {
return;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/jfrog/ide/idea/ui/LocalComponentsTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.jfrog.ide.idea.ui;

import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.JBMenuItem;
import com.intellij.pom.Navigatable;
Expand Down Expand Up @@ -208,7 +207,7 @@ private void setNodesFromCache() {
populateTree(root);

// Run inspections after loaded cache
DumbService.getInstance(project).runWhenSmart(() -> ScanManager.getInstance(project).runInspections(project));
ScanManager.getInstance(project).runInspections(project);
}

public boolean isCacheEmpty() {
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@
enabledByDefault="true"
implementationClass="com.jfrog.ide.idea.inspections.NpmInspection"/>
<annotator language="JSON" implementationClass="com.jfrog.ide.idea.inspections.NpmInspection"/>
<localInspection language="JSON"
displayName="Show in JFrog plugin"
groupBundle="messages.InspectionsBundle"
groupKey="group.names.probable.bugs"
enabledByDefault="true"
implementationClass="com.jfrog.ide.idea.inspections.YarnInspection"/>
<annotator language="JSON" implementationClass="com.jfrog.ide.idea.inspections.YarnInspection"/>
<externalAnnotator language="JavaScript"
implementationClass="com.jfrog.ide.idea.inspections.JFrogSecurityAnnotator"/>
</extensions>
Expand Down
Loading