Merge pull request #78 from linux-china/main

feat: prepare 0.24.0 release

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ## [Unreleased]
 
+## [0.24.0]
+
+- Added: enable download sources
+- Added: attach sources for jbang lib when syncing dependencies
+- Added: NATIVE_OPTIONS support
+- Fixed: support for quoted arguments in the build configuration
+
 ## [0.23.0]
 
 - Fixed: Compatible with IntelliJ IDEA 2022.3

build.gradle.kts

@@ -1,4 +1,3 @@
-import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.tasks.RunPluginVerifierTask.FailureLevel.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -11,7 +10,7 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm") version "1.6.10"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.12.0"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin

gradle.properties

@@ -4,7 +4,7 @@
 pluginGroup = dev.jbang.intellij.plugins
 pluginName = jbang-idea-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.23.0
+pluginVersion = 0.24.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
@@ -23,7 +23,7 @@ platformPlugins = com.intellij.java,org.jetbrains.kotlin,org.intellij.groovy,com
 javaVersion = 11
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.4
+gradleVersion = 7.5.1
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/dev/jbang/idea/JBang.kt

@@ -10,8 +10,8 @@ val jbangIcon = IconLoader.getIcon("icons/jbang-16x16.png", JBangCli::class.java
 val jbangIcon12 = IconLoader.getIcon("icons/jbang-12x12.png", JBangCli::class.java)
 val kotlinIcon = IconLoader.getIcon("icons/kotlin.svg", JBangCli::class.java)
 val groovyIcon = IconLoader.getIcon("icons/groovy.svg", JBangCli::class.java)
-val jshellIcon = IconLoader.getIcon("icons/jshell-16x16.png",JBangCli::class.java)
-val mavenIcon = IconLoader.getIcon("icons/maven.svg",JBangCli::class.java)
+val jshellIcon = IconLoader.getIcon("icons/jshell-16x16.png", JBangCli::class.java)
+val mavenIcon = IconLoader.getIcon("icons/maven.svg", JBangCli::class.java)
 val NOTIFICATION_GROUP_INFO = "JBang Info"
 val NOTIFICATION_GROUP_SUCCESS = "JBang Success"
 val NOTIFICATION_GROUP_FAILURE = "JBang Failure"
@@ -26,6 +26,8 @@ fun getJBangCmdAbsolutionPath(): String {
     return if (SystemInfo.isWindows) {
         if (File(System.getenv("JBANG_HOME") ?: "", "bin/jbang.cmd").exists()) {
             File(System.getenv("JBANG_HOME") ?: "", "bin/jbang.cmd").absolutePath
+        } else if (File(userHome, ".sdkman/candidates/jbang/current/bin/jbang.cmd").exists()) {
+            File(userHome, ".sdkman/candidates/jbang/current/bin/jbang.cmd").absolutePath
         } else {
             File(userHome, ".jbang/bin/jbang.cmd").absolutePath
         }
@@ -34,6 +36,8 @@ fun getJBangCmdAbsolutionPath(): String {
             File(System.getenv("JBANG_HOME") ?: "", "bin/jbang").absolutePath
         } else if (File("/usr/local/bin/jbang").exists()) {
             "/usr/local/bin/jbang"
+        } else if (File(userHome, ".sdkman/candidates/jbang/current/bin/jbang").exists()) {
+            File(userHome, ".sdkman/candidates/jbang/current/bin/jbang").absolutePath
         } else {
             File(userHome, ".jbang/bin/jbang").absolutePath
         }

src/main/kotlin/dev/jbang/idea/actions/SyncDependenciesAction.kt

@@ -17,7 +17,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.Sdk
-import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.LanguageLevelModuleExtension
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
@@ -375,7 +374,10 @@ class SyncDependenciesAction : AnAction() {
         }
         // add jbang dependencies
         if (newDependencies.isNotEmpty()) {
-            ModuleRootModificationUtil.addModuleLibrary(module, libName, newDependencies.map { "jar://${it}!/" }.toList(), listOf())
+            ModuleRootModificationUtil.addModuleLibrary(module, libName,
+                newDependencies.map { "jar://${it}!/" }.toList(),
+                newDependencies.map { "jar://${it}!/" }.map { it.replace(".jar", "-sources.jar") }.toList()
+            )
         }
     }
 

src/main/kotlin/dev/jbang/idea/completion/directive/JBangBaseDirectiveCompletionContributor.kt

@@ -24,6 +24,7 @@ abstract class JBangBaseDirectiveCompletionContributor(language: Language) : Com
             "REPOS" to "Which repositories to use",
             "JAVAC_OPTIONS" to "Options passed to javac",
             "JAVA_OPTIONS" to "Options passed to java",
+            "NATIVE_OPTIONS" to "Options passed to native-image",
             "JAVAAGENT" to "Activate agent packaging",
             "CDS" to "Activate Class Data Sharing"
         )

src/test/java/dev/jbang/idea/completion/directive/BasicDirectiveCompletionTest.java

@@ -21,7 +21,7 @@ public void testCompletionInJava() {
         myFixture.complete(CompletionType.BASIC);
         List<String> lookupElementStrings = myFixture.getLookupElementStrings();
         assertNotNull(lookupElementStrings);
-        assertSameElements(lookupElementStrings, "CDS ", "DEPS ", "DESCRIPTION ","FILES ", "GAV ", "JAVA ", "JAVA_OPTIONS ", "JAVAAGENT ", "JAVAC_OPTIONS ", "MANIFEST ", "REPOS ", "SOURCES ");
+        assertSameElements(lookupElementStrings, "CDS ", "DEPS ", "DESCRIPTION ","FILES ", "GAV ", "JAVA ", "JAVA_OPTIONS ", "JAVAAGENT ", "JAVAC_OPTIONS ", "MANIFEST ", "NATIVE_OPTIONS ", "REPOS ", "SOURCES ");
     }
 
    // @Test disabled unttil can figure out why kotlin and groovy are not activated intests