Skip to content

Commit 2c53dec

Browse files
fwcdfwcd
committed
Migrate fwcd.ktda -> org.javacs.ktda
Make package naming consistent with the language server.
1 parent 3ca1717 commit 2c53dec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+179
-179
lines changed

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"request": "launch",
1414
"name": "Debug KotlinDebugAdapter",
1515
"projectRoot": "${workspaceFolder}/adapter",
16-
"mainClass": "fwcd.ktda.KDAMainKt"
16+
"mainClass": "org.javacs.ktda.KDAMainKt"
1717
}
1818
]
1919
}

‎adapter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
version = projectVersion
88

9-
mainClassName = 'fwcd.ktda.KDAMainKt'
9+
mainClassName = 'org.javacs.ktda.KDAMainKt'
1010
description = 'Debug Adapter for Kotlin'
1111

1212
sourceCompatibility = 1.8

‎adapter/src/main/kotlin/fwcd/ktda/core/event/ExitEvent.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎adapter/src/main/kotlin/fwcd/ktda/core/stack/StackFrame.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎adapter/src/main/kotlin/fwcd/ktda/KDAMain.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/KDAMain.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package fwcd.ktda
1+
package org.javacs.ktda
22

33
import java.util.concurrent.Executors
4-
import fwcd.ktda.adapter.KotlinDebugAdapter
5-
import fwcd.ktda.core.launch.DebugLauncher
6-
import fwcd.ktda.jdi.launch.JDILauncher
7-
import fwcd.ktda.util.ExitingInputStream
8-
import fwcd.ktda.util.LoggingInputStream
9-
import fwcd.ktda.util.LoggingOutputStream
4+
import org.javacs.ktda.adapter.KotlinDebugAdapter
5+
import org.javacs.ktda.core.launch.DebugLauncher
6+
import org.javacs.ktda.jdi.launch.JDILauncher
7+
import org.javacs.ktda.util.ExitingInputStream
8+
import org.javacs.ktda.util.LoggingInputStream
9+
import org.javacs.ktda.util.LoggingOutputStream
1010
import org.eclipse.lsp4j.debug.launch.DSPLauncher
1111
import org.eclipse.lsp4j.debug.services.IDebugProtocolClient
1212
import org.eclipse.lsp4j.debug.TerminatedEventArguments

‎adapter/src/main/kotlin/fwcd/ktda/Logger.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/Logger.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package fwcd.ktda
1+
package org.javacs.ktda
22

3-
import fwcd.ktda.util.DelegatePrintStream
3+
import org.javacs.ktda.util.DelegatePrintStream
44
import java.io.PrintWriter
55
import java.io.StringWriter
66
import java.util.*

‎adapter/src/main/kotlin/fwcd/ktda/adapter/DAPConverter.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/adapter/DAPConverter.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package fwcd.ktda.adapter
1+
package org.javacs.ktda.adapter
22

33
import java.nio.file.Paths
4-
import fwcd.ktda.core.Position
5-
import fwcd.ktda.core.DebuggeeThread
6-
import fwcd.ktda.core.scope.VariableTreeNode
7-
import fwcd.ktda.util.ObjectPool
8-
import fwcd.ktda.util.KotlinDAException
4+
import org.javacs.ktda.core.Position
5+
import org.javacs.ktda.core.DebuggeeThread
6+
import org.javacs.ktda.core.scope.VariableTreeNode
7+
import org.javacs.ktda.util.ObjectPool
8+
import org.javacs.ktda.util.KotlinDAException
99

1010
private typealias DAPSource = org.eclipse.lsp4j.debug.Source
1111
private typealias DAPSourceBreakpoint = org.eclipse.lsp4j.debug.SourceBreakpoint
@@ -15,11 +15,11 @@ private typealias DAPScope = org.eclipse.lsp4j.debug.Scope
1515
private typealias DAPVariable = org.eclipse.lsp4j.debug.Variable
1616
private typealias DAPThread = org.eclipse.lsp4j.debug.Thread
1717
private typealias DAPExceptionBreakpointsFilter = org.eclipse.lsp4j.debug.ExceptionBreakpointsFilter
18-
private typealias InternalSource = fwcd.ktda.core.Source
19-
private typealias InternalSourceBreakpoint = fwcd.ktda.core.breakpoint.SourceBreakpoint
20-
private typealias InternalExceptionBreakpoint = fwcd.ktda.core.breakpoint.ExceptionBreakpoint
21-
private typealias InternalBreakpoint = fwcd.ktda.core.breakpoint.Breakpoint
22-
private typealias InternalStackFrame = fwcd.ktda.core.stack.StackFrame
18+
private typealias InternalSource = org.javacs.ktda.core.Source
19+
private typealias InternalSourceBreakpoint = org.javacs.ktda.core.breakpoint.SourceBreakpoint
20+
private typealias InternalExceptionBreakpoint = org.javacs.ktda.core.breakpoint.ExceptionBreakpoint
21+
private typealias InternalBreakpoint = org.javacs.ktda.core.breakpoint.Breakpoint
22+
private typealias InternalStackFrame = org.javacs.ktda.core.stack.StackFrame
2323

2424
/**
2525
* Handles conversions between debug adapter types

‎adapter/src/main/kotlin/fwcd/ktda/adapter/KotlinDebugAdapter.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/adapter/KotlinDebugAdapter.kt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fwcd.ktda.adapter
1+
package org.javacs.ktda.adapter
22

33
import java.util.concurrent.CompletableFuture
44
import java.util.concurrent.CompletableFuture.completedFuture
@@ -11,25 +11,25 @@ import org.eclipse.lsp4j.debug.*
1111
import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
1212
import org.eclipse.lsp4j.debug.services.IDebugProtocolServer
1313
import org.eclipse.lsp4j.debug.services.IDebugProtocolClient
14-
import fwcd.ktda.LOG
15-
import fwcd.ktda.JSON_LOG
16-
import fwcd.ktda.LogLevel
17-
import fwcd.ktda.LogMessage
18-
import fwcd.ktda.util.KotlinDAException
19-
import fwcd.ktda.util.AsyncExecutor
20-
import fwcd.ktda.util.waitUntil
21-
import fwcd.ktda.core.Debuggee
22-
import fwcd.ktda.core.DebugContext
23-
import fwcd.ktda.core.event.DebuggeeEventBus
24-
import fwcd.ktda.core.event.BreakpointStopEvent
25-
import fwcd.ktda.core.event.StepStopEvent
26-
import fwcd.ktda.core.stack.StackFrame
27-
import fwcd.ktda.core.launch.DebugLauncher
28-
import fwcd.ktda.core.launch.LaunchConfiguration
29-
import fwcd.ktda.core.launch.AttachConfiguration
30-
import fwcd.ktda.core.breakpoint.ExceptionBreakpoint
31-
import fwcd.ktda.classpath.findClassPath
32-
import fwcd.ktda.classpath.findValidKtFilePath
14+
import org.javacs.ktda.LOG
15+
import org.javacs.ktda.JSON_LOG
16+
import org.javacs.ktda.LogLevel
17+
import org.javacs.ktda.LogMessage
18+
import org.javacs.ktda.util.KotlinDAException
19+
import org.javacs.ktda.util.AsyncExecutor
20+
import org.javacs.ktda.util.waitUntil
21+
import org.javacs.ktda.core.Debuggee
22+
import org.javacs.ktda.core.DebugContext
23+
import org.javacs.ktda.core.event.DebuggeeEventBus
24+
import org.javacs.ktda.core.event.BreakpointStopEvent
25+
import org.javacs.ktda.core.event.StepStopEvent
26+
import org.javacs.ktda.core.stack.StackFrame
27+
import org.javacs.ktda.core.launch.DebugLauncher
28+
import org.javacs.ktda.core.launch.LaunchConfiguration
29+
import org.javacs.ktda.core.launch.AttachConfiguration
30+
import org.javacs.ktda.core.breakpoint.ExceptionBreakpoint
31+
import org.javacs.ktda.classpath.findClassPath
32+
import org.javacs.ktda.classpath.findValidKtFilePath
3333

3434
/** The debug server interface conforming to the Debug Adapter Protocol */
3535
class KotlinDebugAdapter(

‎adapter/src/main/kotlin/fwcd/ktda/adapter/LineNumberConverter.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/adapter/LineNumberConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fwcd.ktda.adapter
1+
package org.javacs.ktda.adapter
22

33
/**
44
* Converts between external and internal line numbering.

‎adapter/src/main/kotlin/fwcd/ktda/classpath/FindClassPath.kt renamed to ‎adapter/src/main/kotlin/org/javacs/ktda/classpath/FindClassPath.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package fwcd.ktda.classpath
1+
package org.javacs.ktda.classpath
22

33
import java.util.logging.Level
4-
import fwcd.ktda.LOG
5-
import fwcd.ktda.util.winCompatiblePathOf
6-
import fwcd.ktda.util.tryResolving
7-
import fwcd.ktda.util.firstNonNull
8-
import fwcd.ktda.util.KotlinDAException
9-
import fwcd.ktda.util.ifEmpty
4+
import org.javacs.ktda.LOG
5+
import org.javacs.ktda.util.winCompatiblePathOf
6+
import org.javacs.ktda.util.tryResolving
7+
import org.javacs.ktda.util.firstNonNull
8+
import org.javacs.ktda.util.KotlinDAException
9+
import org.javacs.ktda.util.ifEmpty
1010
import java.io.File
1111
import java.io.IOException
1212
import java.nio.file.Files

0 commit comments

Comments
 (0)