Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ jobs:
tests:
strategy:
matrix:
gradle-properties-version: [ 251, 252 ]
platform-type: [ RR, PC ]
include:
- platform-version: 253
platform-type: RR
- platform-version: 253
platform-type: PY

runs-on: ubuntu-latest
env:
ORG_GRADLE_PROJECT_shortPlatformVersion: ${{ matrix.gradle-properties-version }}
ORG_GRADLE_PROJECT_shortPlatformVersion: ${{ matrix.platform-version }}
ORG_GRADLE_PROJECT_platformType: ${{ matrix.platform-type }}

steps:
Expand Down
5 changes: 0 additions & 5 deletions gradle-252.properties

This file was deleted.

4 changes: 2 additions & 2 deletions gradle-251.properties → gradle-253.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = PC
platformVersion = 2025.1
platformType = PY
platformVersion = 2025.3

useInstaller=true
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xms512m -Xmx4096m "-XX:MaxMetaspaceSize=512m"
propertiesPluginEnvironmentNameProperty=shortPlatformVersion
# properties files
# pass ORG_GRADLE_PROJECT_shortPlatformVersion environment variable to overwrite
shortPlatformVersion=252
shortPlatformVersion=253

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ class MoveLangProjectOpenProcessor: ProjectOpenProcessor() {
return canBeOpened
}

override fun doOpenProject(
override suspend fun openProjectAsync(
virtualFile: VirtualFile,
projectToClose: Project?,
forceOpenInNewFrame: Boolean,
forceOpenInNewFrame: Boolean
): Project? {
val platformOpenProcessor = PlatformProjectOpenProcessor.getInstance()
val basedir = if (virtualFile.isDirectory) virtualFile else virtualFile.parent
return platformOpenProcessor.doOpenProject(basedir, projectToClose, forceOpenInNewFrame)
@Suppress("UnstableApiUsage")
return platformOpenProcessor.openProjectAsync(basedir, projectToClose, forceOpenInNewFrame)
?.also { project ->
@Suppress("DEPRECATION")
StartupManager.getInstance(project)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ class LookupElementTest: MvTestBase() {
val element = findElementInEditor<MvReferenceElement>()

val lookups = mutableListOf<LookupElement>()
val result = object: CompletionResultSet(PrefixMatcher.ALWAYS_TRUE, null, null) {
val result = object: CompletionResultSet(PrefixMatcher.ALWAYS_TRUE, { _ -> }, null) {
override fun caseInsensitive(): CompletionResultSet = this
override fun withPrefixMatcher(matcher: PrefixMatcher): CompletionResultSet = this
override fun withPrefixMatcher(prefix: String): CompletionResultSet = this
override fun restartCompletionOnPrefixChange(prefixCondition: ElementPattern<String>?) {}
override fun restartCompletionOnPrefixChange(p0: ElementPattern<String>) {}
override fun addLookupAdvertisement(text: String) {}
override fun withRelevanceSorter(sorter: CompletionSorter): CompletionResultSet = this
override fun restartCompletionWhenNothingMatches() {}
Expand Down
12 changes: 1 addition & 11 deletions src/test/kotlin/org/move/utils/tests/MvProjectTestBase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ abstract class MvProjectTestBase: CodeInsightFixtureTestCase<ModuleFixtureBuilde
AdvancedSettings.getDefaultBoolean(withAdvancedSetting.id)
)
}
try {
super.tearDown()
// suppress ThreadLeak error
} catch (e: AssertionError) {
addSuppressedException(e)
}
super.tearDown()
}

override fun runTestRunnable(testRunnable: ThrowableRunnable<Throwable>) {
Expand All @@ -89,11 +84,6 @@ abstract class MvProjectTestBase: CodeInsightFixtureTestCase<ModuleFixtureBuilde
super.runTestRunnable(testRunnable)
}

// override fun tearDown() {
//// isProjectInitialized = false
// super.tearDown()
// }

override fun getTestName(lowercaseFirstLetter: Boolean): String {
val camelCase = super.getTestName(lowercaseFirstLetter)
return TestCase.camelOrWordsToSnake(camelCase)
Expand Down
Loading