From e286fb244c940005626abe1682862660ee22e41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jab=C5=82o=C5=84ski?= Date: Mon, 8 Apr 2024 22:22:34 +0200 Subject: [PATCH] Fix tests --- gradle.properties | 2 +- .../org/vlang/ide/VlangPostStartupActivity.kt | 7 +- .../VlangEnumValuesInlayHintsProvider.kt | 3 +- .../ide/hints/VlangInlayHintsCollector.kt | 3 +- src/main/resources/META-INF/plugin.xml | 3 - .../documentation/DocumentationTestBase.kt | 2 +- .../ide/annotators/VlangCommonProblemsTest.kt | 2 - .../ide/inspections/InspectionTestBase.kt | 7 +- .../inspections/VlangGeneralInspectionTest.kt | 4 +- .../documentation/function/Doc.expected.html | 24 +++--- .../resources/hints/enum_fields.v.expected | 86 +++++++++---------- .../resources/hints/enum_fields_2.v.expected | 6 +- 12 files changed, 75 insertions(+), 74 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11f7bdb1..213d1401 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ pluginVersion = 0.0.1-beta.5 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 2024.1 +pluginSinceBuild = 241.14494.240 pluginUntilBuild = 2024.1 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties diff --git a/src/main/kotlin/org/vlang/ide/VlangPostStartupActivity.kt b/src/main/kotlin/org/vlang/ide/VlangPostStartupActivity.kt index d4195494..55cad749 100644 --- a/src/main/kotlin/org/vlang/ide/VlangPostStartupActivity.kt +++ b/src/main/kotlin/org/vlang/ide/VlangPostStartupActivity.kt @@ -7,7 +7,7 @@ import com.intellij.ide.util.PropertiesComponent import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.options.ShowSettingsUtil import com.intellij.openapi.project.Project -import com.intellij.openapi.startup.StartupActivity +import com.intellij.openapi.startup.ProjectActivity import com.intellij.openapi.util.registry.Registry import com.jetbrains.cidr.execution.debugger.evaluation.CidrValue import org.vlang.configurations.VlangProjectStructureState.Companion.projectStructure @@ -18,8 +18,9 @@ import org.vlang.toolchain.VlangToolchain import org.vlang.toolchain.VlangToolchainService.Companion.toolchainSettings import javax.swing.SwingUtilities.invokeLater -class VlangPostStartupActivity : StartupActivity { - override fun runActivity(project: Project) { +class VlangPostStartupActivity : ProjectActivity { + + override suspend fun execute(project: Project) { val knownToolchains = VlangKnownToolchainsState.getInstance().knownToolchains val toolchainSettings = project.toolchainSettings diff --git a/src/main/kotlin/org/vlang/ide/hints/VlangEnumValuesInlayHintsProvider.kt b/src/main/kotlin/org/vlang/ide/hints/VlangEnumValuesInlayHintsProvider.kt index 9fc0dbf8..49f3085c 100644 --- a/src/main/kotlin/org/vlang/ide/hints/VlangEnumValuesInlayHintsProvider.kt +++ b/src/main/kotlin/org/vlang/ide/hints/VlangEnumValuesInlayHintsProvider.kt @@ -1,6 +1,5 @@ package org.vlang.ide.hints -import com.intellij.codeInsight.daemon.impl.InlayHintsPassFactoryInternal import com.intellij.codeInsight.hints.* import com.intellij.codeInsight.hints.presentation.InlayPresentation import com.intellij.codeInsight.hints.presentation.InsetPresentation @@ -96,7 +95,7 @@ class VlangEnumValuesInlayHintsProvider : InlayHintsProviderV language implementationClass="org.vlang.lang.search.VlangSuperMarkerProvider"/> - - diff --git a/src/test/kotlin/org/vlang/documentation/DocumentationTestBase.kt b/src/test/kotlin/org/vlang/documentation/DocumentationTestBase.kt index 269b7b92..1b58ff03 100644 --- a/src/test/kotlin/org/vlang/documentation/DocumentationTestBase.kt +++ b/src/test/kotlin/org/vlang/documentation/DocumentationTestBase.kt @@ -4,13 +4,13 @@ import com.intellij.codeInsight.documentation.DocumentationManager import com.intellij.psi.PsiElement import com.intellij.psi.util.parentOfTypes import com.intellij.testFramework.fixtures.BasePlatformTestCase -import com.intellij.util.io.readText import org.vlang.lang.psi.VlangImportName import org.vlang.lang.psi.VlangNamedElement import org.vlang.lang.psi.VlangReferenceExpression import org.vlang.utils.toPath import java.io.File import java.nio.file.Files +import kotlin.io.path.readText @Suppress("DEPRECATION") abstract class DocumentationTestBase : BasePlatformTestCase() { diff --git a/src/test/kotlin/org/vlang/ide/annotators/VlangCommonProblemsTest.kt b/src/test/kotlin/org/vlang/ide/annotators/VlangCommonProblemsTest.kt index 7dbf4a03..01ab6883 100644 --- a/src/test/kotlin/org/vlang/ide/annotators/VlangCommonProblemsTest.kt +++ b/src/test/kotlin/org/vlang/ide/annotators/VlangCommonProblemsTest.kt @@ -19,6 +19,4 @@ class VlangCommonProblemsTest : AnnotatorTestBase() { fun `test attributes for interface members`() = doTest("attributes_for_interface_members.v") fun `test assign values count mismatch`() = doTest("assign_values_count_mismatch.v") fun `test it variable inside array init is deprecated`() = doTestQuickFix("it_variable_inside_array_init_is_deprecated.v") - fun `test empty enum`() = doTest("empty_enum.v") - fun `test mut parameter`() = doTest("mut_parameter.v") } diff --git a/src/test/kotlin/org/vlang/ide/inspections/InspectionTestBase.kt b/src/test/kotlin/org/vlang/ide/inspections/InspectionTestBase.kt index ecadbcbe..7aa0d118 100644 --- a/src/test/kotlin/org/vlang/ide/inspections/InspectionTestBase.kt +++ b/src/test/kotlin/org/vlang/ide/inspections/InspectionTestBase.kt @@ -30,7 +30,12 @@ abstract class InspectionTestBase(private val baseFolder: String = "") : BasePla val qfFile = fixtureFile.replace(".v", ".after.v") if (File(myFixture.testDataPath + "/" + qfFile).exists()) { - myFixture.getAllQuickFixes().forEach { myFixture.launchAction(it) } + myFixture.getAllQuickFixes().forEach { + // one fix can affect others - we need to check if the original fix is still available + if (it.isAvailable(myFixture.project, myFixture.editor, myFixture.file)) { + myFixture.launchAction(it) + } + } myFixture.checkResultByFile(qfFile) } } diff --git a/src/test/kotlin/org/vlang/ide/inspections/VlangGeneralInspectionTest.kt b/src/test/kotlin/org/vlang/ide/inspections/VlangGeneralInspectionTest.kt index 76f54965..eb87ab60 100644 --- a/src/test/kotlin/org/vlang/ide/inspections/VlangGeneralInspectionTest.kt +++ b/src/test/kotlin/org/vlang/ide/inspections/VlangGeneralInspectionTest.kt @@ -15,5 +15,7 @@ class VlangGeneralInspectionTest : InspectionTestBase("general") { doTestQuickFix("non_exhaustive_match_add_else.v", VlangNonExhaustiveMatchInspection(), "Add else branch") fun `test call arguments count mismatch`() = doTest("call_arguments_count_mismatch.v", VlangCallArgumentsCountMismatchInspection()) - fun `test raw result type`() = doTest("raw_result_type.v", VlangRawOptionOrResultTypeUsedInspection()) + + // TODO: create test file for VlangRawOptionOrResultTypeUsedInspection + //fun `test raw result type`() = doTest("raw_result_type.v", VlangRawOptionOrResultTypeUsedInspection()) } diff --git a/src/test/resources/documentation/function/Doc.expected.html b/src/test/resources/documentation/function/Doc.expected.html index d7c93e41..7d4d1887 100644 --- a/src/test/resources/documentation/function/Doc.expected.html +++ b/src/test/resources/documentation/function/Doc.expected.html @@ -1,22 +1,22 @@
Module: function
fn foo()



Module: function
fn foo1(a int)



Module: function
pub fn foo2(
-    a int,
-    b string,
+    a int,
+    b string,
 )



Module: function
fn foo3(
-    a int,
-    b string,
-    c f64,
+    a int,
+    b string,
+    c f64,
 ) string

foo3 is a function with a return value




Module: function
parameter c f64



Module: function
fn foo4[T](a T) T



Module: function
fn foo5(mut a string) string



Module: function
pub fn foo6(
-   mut        a string,
-   shared     b int,
-   mut shared c string,
+   mut        a string,
+   shared     b int,
+   mut shared c string,
 ) !string

foo6 is a function with a return value and some long documentation




Module: function
mut parameter a string



Module: function
fn foo7(
-   mut a string,
-       b shared int,
+   mut a string,
+       b shared int,
 ) !string



Module: function
parameter b shared int



Module: function
fn foo8() !



Module: function
fn foo9() (int, string)



Module: function
fn foo10(mut a ...string)



Module: function
mut parameter a ...string



Module: function
fn foo11(
-    s int,
-    a ...string,
+    s int,
+    a ...string,
 )



Module: function
parameter a ...string
\ No newline at end of file diff --git a/src/test/resources/hints/enum_fields.v.expected b/src/test/resources/hints/enum_fields.v.expected index 901e9d9e..df129495 100644 --- a/src/test/resources/hints/enum_fields.v.expected +++ b/src/test/resources/hints/enum_fields.v.expected @@ -1,100 +1,100 @@ module hints enum Simple { - read<# = 0 #> - write<# = 1 #> - unknown<# = 2 #> + read/*<# = 0 #>*/ + write/*<# = 1 #>*/ + unknown/*<# = 2 #>*/ } enum WithCustomValue { - read<# = 0 #> + read/*<# = 0 #>*/ write = 100 - unknown<# = 101 #> + unknown/*<# = 101 #>*/ } enum WithCustomValue2 { read = 100 - write<# = 101 #> - unknown<# = 102 #> + write/*<# = 101 #>*/ + unknown/*<# = 102 #>*/ } enum WithCustomValue3 { read = 100 - write<# = 101 #> + write/*<# = 101 #>*/ other= 105 - unknown<# = 106 #> + unknown/*<# = 106 #>*/ } enum WithComplexValue { read = 1 << 5 - write<# = 33 #> - other<# = 34 #> - unknown<# = 35 #> + write/*<# = 33 #>*/ + other/*<# = 34 #>*/ + unknown/*<# = 35 #>*/ } enum WithComplexValue { read = 1 << 5 - write<# = 33 #> - other<# = 34 #> - unknown<# = 35 #> + write/*<# = 33 #>*/ + other/*<# = 34 #>*/ + unknown/*<# = 35 #>*/ } enum WithNegativeValue { read = -5 - write<# = -4 #> - other<# = -3 #> - unknown<# = -2 #> + write/*<# = -4 #>*/ + other/*<# = -3 #>*/ + unknown/*<# = -2 #>*/ } enum WithNegativeComplexValue { read = -5 << 3 - write<# = -39 #> - other<# = -38 #> - unknown<# = -37 #> + write/*<# = -39 #>*/ + other/*<# = -38 #>*/ + unknown/*<# = -37 #>*/ } enum WithBinValue { read = 0b0010 - write<# = 3 #> - other<# = 4 #> - unknown<# = 5 #> + write/*<# = 3 #>*/ + other/*<# = 4 #>*/ + unknown/*<# = 5 #>*/ } enum WithOctValue { read = 0o0010 - write<# = 9 #> - other<# = 10 #> - unknown<# = 11 #> + write/*<# = 9 #>*/ + other/*<# = 10 #>*/ + unknown/*<# = 11 #>*/ } enum WithHexValue { read = 0xFFF - write<# = 4096 #> - other<# = 4097 #> - unknown<# = 4098 #> + write/*<# = 4096 #>*/ + other/*<# = 4097 #>*/ + unknown/*<# = 4098 #>*/ } enum WithSeveralCustomValue { file = 0 - folder<# = 1 #> + folder/*<# = 1 #>*/ // archive format zip = 16 - archive_file<# = 17 #> + archive_file/*<# = 17 #>*/ // graphic format, MUST stay after the other types!! bmp = 32 - jpg<# = 33 #> - png<# = 34 #> - gif<# = 35 #> - tga<# = 36 #> - ppm<# = 37 #> - pgm<# = 38 #> - pic<# = 39 #> - hdr<# = 40 #> + jpg/*<# = 33 #>*/ + png/*<# = 34 #>*/ + gif/*<# = 35 #>*/ + tga/*<# = 36 #>*/ + ppm/*<# = 37 #>*/ + pgm/*<# = 38 #>*/ + pic/*<# = 39 #>*/ + hdr/*<# = 40 #>*/ } [flag] enum FlagEnum as u8 { - red<# = 0b1 (1) #> - other<# = 0b10 (2) #> - blue<# = 0b100 (4) #> + red/*<# = 0b1 (1) #>*/ + other/*<# = 0b10 (2) #>*/ + blue/*<# = 0b100 (4) #>*/ } diff --git a/src/test/resources/hints/enum_fields_2.v.expected b/src/test/resources/hints/enum_fields_2.v.expected index 8daca9ec..258a7e68 100644 --- a/src/test/resources/hints/enum_fields_2.v.expected +++ b/src/test/resources/hints/enum_fields_2.v.expected @@ -2,7 +2,7 @@ module hints [flag] enum FlagEnum as u8 { - red<# = 1 #> - other<# = 2 #> - blue<# = 4 #> + red/*<# = 1 #>*/ + other/*<# = 2 #>*/ + blue/*<# = 4 #>*/ }