Merge pull request #328 from AllanGuigou/master

Allow a gadget to specify a custom extension path

python3/vimspector/installer.py

@@ -340,11 +340,12 @@ def WriteAdapters( all_adapters, to_file=None ):
 
 
 def InstallGeneric( name, root, gadget ):
-  extension = os.path.join( root, 'extension' )
+  extension_path = gadget.get( 'extension_path', 'extension' )
+  extension = os.path.join( root, extension_path )
   for f in gadget.get( 'make_executable', [] ):
     MakeExecutable( os.path.join( extension, f ) )
 
-  MakeExtensionSymlink( name, root )
+  MakeExtensionSymlink( name, root, extension_path )
 
 
 def InstallCppTools( name, root, gadget ):
@@ -699,8 +700,8 @@ def ExtractZipTo( file_path, destination, format ):
         CheckCall( [ 'tar', 'zxvf', file_path ] )
 
 
-def MakeExtensionSymlink( name, root ):
+def MakeExtensionSymlink( name, root, extension_path = 'extension' ):
-  MakeSymlink( name, os.path.join( root, 'extension' ) ),
+  MakeSymlink( name, os.path.join( root, extension_path ) ),
 
 
 def MakeSymlink( link, pointing_to, in_folder = None ):

support/test/kotlin/.gitignore

@@ -0,0 +1,2 @@
+.gradle
+build

support/test/kotlin/.vimspector.json

@@ -0,0 +1,21 @@
+{
+  "configurations": {
+    "kotlin-debug-adapter launch": {
+      "adapter": "cust_kotlin-debug-adapter",
+      "configuration": {
+        "request": "launch",
+        "projectRoot": "${workspaceFolder}",
+        "mainClass": "vimspector/test/ApplicationKt"
+      }
+    },
+    "kotlin-debug-adapter attach": {
+      "adapter": "cust_kotlin-debug-adapter",
+      "configuration": {
+        "request": "attach",
+        "projectRoot": "${workspaceFolder}",
+        "hostName": "${hostName}",
+        "port": "${port}"
+      }
+    }
+  }
+}

support/test/kotlin/build.gradle.kts

@@ -0,0 +1,25 @@
+plugins {
+    kotlin("jvm") version "1.4.0"
+
+    application
+}
+
+repositories {
+    // Use jcenter for resolving dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    jcenter()
+}
+
+dependencies {
+    // Align versions of all Kotlin components
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+
+    // Use the Kotlin JDK 8 standard library.
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+}
+
+application {
+    // Define the main class for the application.
+    mainClassName = "vimspector.test.ApplicationKt"
+}
+

support/test/kotlin/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "vimspector-test"

support/test/kotlin/src/main/kotlin/vimspector/test/Application.kt

@@ -0,0 +1,5 @@
+package vimspector.test
+
+fun main(args: Array<String>) {
+    println("Hello World!")
+}