Merge pull request fwcd#56 from fwcd/cleanup-and-actions

Migrate to GitHub Actions and update to Kotlin 1.4.20, LSP4J 0.10.0 and Gradle 6.6

Author: fwcd

.github/workflows/build.yml

@@ -0,0 +1,17 @@
+name: Build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ['11']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build
+        run: ./gradlew :adapter:build

.github/workflows/deploy.yml

@@ -0,0 +1,36 @@
+name: Deploy
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Build distribution
+        run: ./gradlew :adapter:distZip
+      - name: Create release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Version ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Upload asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./adapter/build/distributions/adapter.zip
+          asset_name: adapter.zip
+          asset_content_type: application/zip

.travis.yml

@@ -1,7 +1,7 @@
 # Kotlin Debug Adapter
 
 [![Release](https://img.shields.io/github/release/fwcd/kotlin-debug-adapter)](https://github.com/fwcd/kotlin-debug-adapter/releases)
-[![Build Status](https://travis-ci.org/fwcd/kotlin-debug-adapter.svg?branch=master)](https://travis-ci.org/fwcd/kotlin-debug-adapter)
+[![Build](https://github.com/fwcd/kotlin-debug-adapter/workflows/Build/badge.svg)](https://github.com/fwcd/kotlin-debug-adapter/actions)
 [![Downloads](https://img.shields.io/github/downloads/fwcd/kotlin-debug-adapter/total)](https://github.com/fwcd/kotlin-debug-adapter/releases)
 [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da)](https://discord.gg/cNtppzN)
 

README.md

@@ -17,16 +17,15 @@ startScripts {
 }
 
 repositories {
-	mavenCentral()
 	maven { url 'https://jitpack.io' }
 }
 
 dependencies {
 	// The JSON-RPC and Debug Adapter Protocol implementations
-	implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.6.0'
+	implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.10.0'
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
-	implementation 'com.github.fwcd.kotlin-language-server:shared:229c762a4d75304d21eba6d8e1231ed949247629'
+	implementation 'com.github.fwcd.kotlin-language-server:shared:fb2c4f58aec6738ee2b66afb583ab51e2c424ebb'
 	// The Java Debug Interface classes (com.sun.jdi.*)
 	implementation files("${System.properties['java.home']}/../lib/tools.jar")
 	testImplementation 'junit:junit:4.12'

adapter/build.gradle

@@ -72,23 +72,23 @@ class DAPConverter(
 	fun toDAPBreakpoint(internalBreakpoint: InternalBreakpoint) = DAPBreakpoint().apply {
 		source = toDAPSource(internalBreakpoint.position.source)
 		line = lineConverter.toExternalLine(internalBreakpoint.position.lineNumber)
-		verified = true
+		isVerified = true
 	}
 
 	fun toInternalStackFrame(frameId: Long) = stackFramePool.getByID(frameId)
 
 	fun toDAPStackFrame(internalFrame: InternalStackFrame, threadId: Long) = DAPStackFrame().apply {
-		id = stackFramePool.store(threadId, internalFrame)
+		id = stackFramePool.store(threadId, internalFrame).toInt()
 		name = internalFrame.name
-		line = internalFrame.position?.lineNumber?.let(lineConverter::toExternalLine) ?: 0L
+		line = internalFrame.position?.lineNumber?.let(lineConverter::toExternalLine) ?: 0
 		column = (internalFrame.position?.columnNumber ?: 1).let(columnConverter::toExternalLine)
 		source = internalFrame.position?.source?.let(::toDAPSource)
 	}
 
 	fun toDAPScope(variableTree: VariableTreeNode) = DAPScope().apply {
 		name = variableTree.name
-		variablesReference = variablesPool.store(Unit, variableTree)
-		expensive = false
+		variablesReference = variablesPool.store(Unit, variableTree).toInt()
+		isExpensive = false
 	}
 
 	fun toVariableTree(variablesReference: Long) = variablesPool.getByID(variablesReference)
@@ -97,12 +97,12 @@ class DAPConverter(
 		name = variableTree.name
 		value = variableTree.value
 		type = variableTree.type
-		variablesReference = variableTree.childs?.takeIf { it.isNotEmpty() }?.let { variablesPool.store(Unit, variableTree) } ?: 0
+		variablesReference = (variableTree.childs?.takeIf { it.isNotEmpty() }?.let { variablesPool.store(Unit, variableTree) } ?: 0).toInt()
 	}
 
 	fun toDAPThread(internalThread: DebuggeeThread) = DAPThread().apply {
 		name = internalThread.name
-		id = internalThread.id
+		id = internalThread.id.toInt()
 	}
 
 	fun toDAPCompletionItem(internalItem: InternalCompletionItem) = DAPCompletionItem().apply {

adapter/src/main/kotlin/org/javacs/ktda/adapter/DAPConverter.kt

@@ -55,10 +55,10 @@ class KotlinDebugAdapter(
 
 	override fun initialize(args: InitializeRequestArguments): CompletableFuture<Capabilities> = async.compute {
 		converter.lineConverter = LineNumberConverter(
-			externalLineOffset = if (args.linesStartAt1) 0L else -1L
+			externalLineOffset = if (args.linesStartAt1) 0 else -1
 		)
 		converter.columnConverter = LineNumberConverter(
-			externalLineOffset = if (args.columnsStartAt1) 0L else -1L
+			externalLineOffset = if (args.columnsStartAt1) 0 else -1
 		)
 
 		val capabilities = Capabilities()
@@ -135,7 +135,7 @@ class KotlinDebugAdapter(
 		val eventBus = debuggee.eventBus
 		eventBus.exitListeners.add {
 			// TODO: Use actual exitCode instead
-			sendExitEvent(0L)
+			sendExitEvent(0)
 		}
 		eventBus.breakpointListeners.add {
 			sendStopEvent(it.threadID, StoppedEventArgumentsReason.BREAKPOINT)
@@ -175,20 +175,20 @@ class KotlinDebugAdapter(
 	private fun sendThreadEvent(threadId: Long, reason: String) {
 		client!!.thread(ThreadEventArguments().also {
 			it.reason = reason
-			it.threadId = threadId
+			it.threadId = threadId.toInt()
 		})
 	}
 
 	private fun sendStopEvent(threadId: Long, reason: String) {
 		client!!.stopped(StoppedEventArguments().also {
 			it.reason = reason
-			it.threadId = threadId
+			it.threadId = threadId.toInt()
 		})
 	}
 
 	private fun sendExitEvent(exitCode: Long) {
 		client!!.exited(ExitedEventArguments().also {
-			it.exitCode = exitCode
+			it.exitCode = exitCode.toInt()
 		})
 		client!!.terminated(TerminatedEventArguments())
 		LOG.info("Sent exit event")
@@ -284,7 +284,7 @@ class KotlinDebugAdapter(
 	}
 
 	override fun continue_(args: ContinueArguments) = async.compute {
-		var success = debuggee!!.threadByID(args.threadId)?.resume() ?: false
+		var success = debuggee!!.threadByID(args.threadId.toLong())?.resume() ?: false
 		var allThreads = false
 
 		if (!success) {
@@ -296,7 +296,7 @@ class KotlinDebugAdapter(
 		if (success) {
 			exceptionsPool.clear()
 			converter.variablesPool.clear()
-			converter.stackFramePool.removeAllOwnedBy(args.threadId)
+			converter.stackFramePool.removeAllOwnedBy(args.threadId.toLong())
 		}
 
 		ContinueResponse().apply {
@@ -305,15 +305,15 @@ class KotlinDebugAdapter(
 	}
 
 	override fun next(args: NextArguments) = async.execute {
-		debuggee!!.threadByID(args.threadId)?.stepOver()
+		debuggee!!.threadByID(args.threadId.toLong())?.stepOver()
 	}
 
 	override fun stepIn(args: StepInArguments) = async.execute {
-		debuggee!!.threadByID(args.threadId)?.stepInto()
+		debuggee!!.threadByID(args.threadId.toLong())?.stepInto()
 	}
 
 	override fun stepOut(args: StepOutArguments) = async.execute {
-		debuggee!!.threadByID(args.threadId)?.stepOut()
+		debuggee!!.threadByID(args.threadId.toLong())?.stepOut()
 	}
 
 	override fun stepBack(args: StepBackArguments): CompletableFuture<Void> = notImplementedDAPMethod()
@@ -326,10 +326,10 @@ class KotlinDebugAdapter(
 
 	override fun pause(args: PauseArguments) = async.execute {
 		val threadId = args.threadId
-		val success = debuggee!!.threadByID(threadId)?.pause()
+		val success = debuggee!!.threadByID(threadId.toLong())?.pause()
 		if (success ?: false) {
 			// If successful
-			sendStopEvent(threadId,
+			sendStopEvent(threadId.toLong(),
 				StoppedEventArgumentsReason.PAUSE
 			)
 		}
@@ -344,18 +344,18 @@ class KotlinDebugAdapter(
 		val threadId = args.threadId
 		return completedFuture(StackTraceResponse().apply {
 			stackFrames = debuggee!!
-				.threadByID(threadId)
+				.threadByID(threadId.toLong())
 				?.stackTrace()
 				?.frames
-				?.map { converter.toDAPStackFrame(it, threadId) }
+				?.map { converter.toDAPStackFrame(it, threadId.toLong()) }
 				?.toTypedArray()
 				.orEmpty()
 		})
 	}
 
 	override fun scopes(args: ScopesArguments) = completedFuture(
 		ScopesResponse().apply {
-			scopes = (converter.toInternalStackFrame(args.frameId)
+			scopes = (converter.toInternalStackFrame(args.frameId.toLong())
 					?: throw KotlinDAException("Could not find stackTrace with ID ${args.frameId}"))
 				.scopes
 				.map(converter::toDAPScope)
@@ -366,6 +366,7 @@ class KotlinDebugAdapter(
 	override fun variables(args: VariablesArguments) = completedFuture(
 		VariablesResponse().apply {
 			variables = (args.variablesReference
+				.toLong()
 				.let(converter::toVariableTree)
 					?: throw KotlinDAException("Could not find variablesReference with ID ${args.variablesReference}"))
 				.childs
@@ -396,6 +397,7 @@ class KotlinDebugAdapter(
 
 	override fun evaluate(args: EvaluateArguments): CompletableFuture<EvaluateResponse> = async.compute {
 		val variable = (args.frameId
+			.toLong()
 			.let(converter::toInternalStackFrame)
 				?: throw KotlinDAException("Could not find stack frame with ID ${args.frameId}"))
 			.evaluate(args.expression)
@@ -414,6 +416,7 @@ class KotlinDebugAdapter(
 	override fun completions(args: CompletionsArguments): CompletableFuture<CompletionsResponse> = async.compute {
 		CompletionsResponse().apply {
 			targets = (args.frameId
+				.toLong()
 				.let(converter::toInternalStackFrame)
 					?: throw KotlinDAException("Could not find stack frame with ID ${args.frameId}"))
 				.completions(args.text)
@@ -423,7 +426,7 @@ class KotlinDebugAdapter(
 	}
 
 	override fun exceptionInfo(args: ExceptionInfoArguments): CompletableFuture<ExceptionInfoResponse> = async.compute {
-		val id = exceptionsPool.getIDsOwnedBy(args.threadId).firstOrNull()
+		val id = exceptionsPool.getIDsOwnedBy(args.threadId.toLong()).firstOrNull()
 		val exception = id?.let { exceptionsPool.getByID(it) }
 		ExceptionInfoResponse().apply {
 			exceptionId = id?.toString() ?: ""

adapter/src/main/kotlin/org/javacs/ktda/adapter/KotlinDebugAdapter.kt

@@ -10,9 +10,9 @@ package org.javacs.ktda.adapter
  * In this case, externalLineOffset would be -1.
  */
 class LineNumberConverter(
-	private val externalLineOffset: Long = 0 // Internal line + externalLineOffset = External line
+	private val externalLineOffset: Int = 0 // Internal line + externalLineOffset = External line
 ) {
-	fun toInternalLine(lineNumber: Long) = lineNumber - externalLineOffset
+	fun toInternalLine(lineNumber: Int) = lineNumber - externalLineOffset
 
-	fun toExternalLine(lineNumber: Long) = lineNumber + externalLineOffset
+	fun toExternalLine(lineNumber: Int) = lineNumber + externalLineOffset
 }

adapter/src/main/kotlin/org/javacs/ktda/adapter/LineNumberConverter.kt

@@ -3,6 +3,6 @@ package org.javacs.ktda.core
 /** A source code position. Line and column numbers are 1-indexed */
 class Position(
 	val source: Source,
-	val lineNumber: Long,
-	val columnNumber: Long? = null
+	val lineNumber: Int,
+	val columnNumber: Int? = null
 )

adapter/src/main/kotlin/org/javacs/ktda/core/Position.kt

@@ -75,7 +75,7 @@ class JDIDebuggee(
 		breakpoints.forEach { bp ->
 			bp.position.let { setBreakpoint(
 				it.source.filePath.toAbsolutePath().toString(),
-				it.lineNumber
+				it.lineNumber.toLong()
 			) }
 		}
 	}
@@ -165,7 +165,7 @@ class JDIDebuggee(
 	}
 
 	override fun positionOf(location: Location): Position? = sourceOf(location)
-		?.let { Position(it, location.lineNumber().toLong()) }
+		?.let { Position(it, location.lineNumber()) }
 
 	private fun sourceOf(location: Location): Source? {
 		val sourcePath = location.sourcePath()