diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03a54ee..286f6b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,6 +138,9 @@ jobs: # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis # Set up Java environment for the next steps - name: Setup Java @@ -149,6 +152,8 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection uses: JetBrains/qodana-action@v2024.2.3 + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} # read the steps about it below with: cache-default-branch-only: true diff --git a/qodana.yml b/qodana.yml index cbf640f..a502427 100644 --- a/qodana.yml +++ b/qodana.yml @@ -2,7 +2,7 @@ # https://www.jetbrains.com/help/qodana/qodana-yaml.html version: 1.0 -linter: jetbrains/qodana-jvm-community:latest +linter: jetbrains/qodana-jvm-community:2024.2 projectJDK: "17" profile: name: qodana.recommended diff --git a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickFixPsiReferenceProvider.java b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickFixPsiReferenceProvider.java index 3900841..2f6ec80 100644 --- a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickFixPsiReferenceProvider.java +++ b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickFixPsiReferenceProvider.java @@ -3,9 +3,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.PsiReferenceProvider; -import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; -import com.intellij.psi.xml.XmlTag; import com.intellij.util.ProcessingContext; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixPsiReference.java b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixPsiReference.java index fe14cd2..e5c4052 100644 --- a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixPsiReference.java +++ b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixPsiReference.java @@ -1,11 +1,8 @@ package ac.quant.quickfixspec.clickableviews; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; -import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlTag; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixSpecPsiReferenceContributor.java b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixSpecPsiReferenceContributor.java index 52d0b7f..481cc5d 100644 --- a/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixSpecPsiReferenceContributor.java +++ b/src/main/java/ac/quant/quickfixspec/clickableviews/QuickfixSpecPsiReferenceContributor.java @@ -5,9 +5,7 @@ import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.patterns.PsiElementPattern; -import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; -import com.intellij.psi.xml.XmlTag; import org.jetbrains.annotations.NotNull; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/ac/quant/quickfixspec/inlay/QuickfixInlayHintsProvider.java b/src/main/java/ac/quant/quickfixspec/inlay/QuickfixInlayHintsProvider.java index 373e6df..0d72924 100644 --- a/src/main/java/ac/quant/quickfixspec/inlay/QuickfixInlayHintsProvider.java +++ b/src/main/java/ac/quant/quickfixspec/inlay/QuickfixInlayHintsProvider.java @@ -2,24 +2,15 @@ import com.intellij.codeInsight.hints.*; import com.intellij.codeInsight.hints.presentation.*; -import com.intellij.ide.DataManager; import com.intellij.lang.Language; import com.intellij.lang.xml.XMLLanguage; -import com.intellij.openapi.actionSystem.ActionManager; -import com.intellij.openapi.actionSystem.ActionPlaces; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.editor.Inlay; import com.intellij.psi.*; import com.intellij.psi.xml.*; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import static ac.quant.quickfixspec.common.PsiUtils.getRootTag; diff --git a/src/main/java/ac/quant/quickfixspec/toolbar/QuickfixFloatingToolbar.java b/src/main/java/ac/quant/quickfixspec/toolbar/QuickfixFloatingToolbar.java index 5845f2e..13ef4d7 100644 --- a/src/main/java/ac/quant/quickfixspec/toolbar/QuickfixFloatingToolbar.java +++ b/src/main/java/ac/quant/quickfixspec/toolbar/QuickfixFloatingToolbar.java @@ -1,6 +1,5 @@ package ac.quant.quickfixspec.toolbar; import com.intellij.openapi.Disposable; -import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.toolbar.floating.*; diff --git a/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTarget.kt b/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTarget.kt index 6ec2b3d..f472103 100644 --- a/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTarget.kt +++ b/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTarget.kt @@ -7,7 +7,6 @@ import com.intellij.platform.backend.documentation.DocumentationResult import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.platform.backend.presentation.TargetPresentation import com.intellij.psi.xml.XmlTag -import com.intellij.openapi.diagnostic.Logger @Suppress("UnstableApiUsage") class QuickfixComponentDocumentationTarget( @@ -36,11 +35,7 @@ class QuickfixComponentDocumentationTarget( private fun getComponentDetails(componentName: String): String { val component: XmlTag? = findComponent(rootTag, componentName) - if (component == null) { - println("Component with name $componentName not found") - return "" - } - + component ?: return "" return getDisplayText(component) } diff --git a/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTargetProvider.kt b/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTargetProvider.kt index 8773e2b..d22e589 100644 --- a/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTargetProvider.kt +++ b/src/main/kotlin/ac/quant/quickfixspec/documentation/QuickfixComponentDocumentationTargetProvider.kt @@ -1,7 +1,5 @@ package ac.quant.quickfixspec.documentation -//class QuickfixComponentDocumentationTargetProvider : DocumentationTargetProvider { - import ac.quant.quickfixspec.common.PsiUtils.getRootTag import com.intellij.platform.backend.documentation.DocumentationTarget import com.intellij.platform.backend.documentation.DocumentationTargetProvider diff --git a/src/main/kotlin/ac/quant/quickfixspec/ui/ShowNotificationSampleAction.kt b/src/main/kotlin/ac/quant/quickfixspec/ui/ShowNotificationSampleAction.kt index 8fb6923..e14c844 100644 --- a/src/main/kotlin/ac/quant/quickfixspec/ui/ShowNotificationSampleAction.kt +++ b/src/main/kotlin/ac/quant/quickfixspec/ui/ShowNotificationSampleAction.kt @@ -3,7 +3,6 @@ package ac.quant.quickfixspec.ui import com.intellij.notification.* import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.AnActionEvent -import com.intellij.openapi.actionSystem.CommonDataKeys class ShowNotificationSampleAction : AnAction() {