You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sh...@apache.org on 2023/03/21 12:17:20 UTC

[daffodil-vscode] branch main updated: Send config debugServer value to runDebugger. Remove default port from runDebugger.

This is an automated email from the ASF dual-hosted git repository.

shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git


The following commit(s) were added to refs/heads/main by this push:
     new f1a2fd9  Send config debugServer value to runDebugger. Remove default port from runDebugger.
f1a2fd9 is described below

commit f1a2fd9a517bca7f06a58582f77e7567572e2216
Author: Shane Dell <sh...@gmail.com>
AuthorDate: Fri Mar 17 17:11:24 2023 -0400

    Send config debugServer value to runDebugger. Remove default port from runDebugger.
    
    Closes #497
---
 src/daffodilDebugger.ts                  | 3 ++-
 src/daffodilDebuggerUtils.ts             | 2 +-
 src/tests/suite/daffodilDebugger.test.ts | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/daffodilDebugger.ts b/src/daffodilDebugger.ts
index 9df3e93..71858e3 100644
--- a/src/daffodilDebugger.ts
+++ b/src/daffodilDebugger.ts
@@ -211,7 +211,8 @@ export async function getDebugger(
       await runDebugger(
         rootPath,
         daffodilDebugClasspath,
-        context.asAbsolutePath('./package.json')
+        context.asAbsolutePath('./package.json'),
+        config.debugServer
       )
     }
   }
diff --git a/src/daffodilDebuggerUtils.ts b/src/daffodilDebuggerUtils.ts
index df4d3ee..9eafff3 100644
--- a/src/daffodilDebuggerUtils.ts
+++ b/src/daffodilDebuggerUtils.ts
@@ -62,7 +62,7 @@ export async function runDebugger(
   rootPath: string,
   daffodilDebugClasspath: string,
   filePath: string,
-  serverPort: number = 4711
+  serverPort: number
 ): Promise<vscode.Terminal> {
   const dfdlVersion = daffodilVersion(filePath)
   const artifact = daffodilArtifact(dfdlVersion)
diff --git a/src/tests/suite/daffodilDebugger.test.ts b/src/tests/suite/daffodilDebugger.test.ts
index 7e6dab9..f935759 100644
--- a/src/tests/suite/daffodilDebugger.test.ts
+++ b/src/tests/suite/daffodilDebugger.test.ts
@@ -50,7 +50,7 @@ suite('Daffodil Debugger', () => {
 
   before(async () => {
     await unzipFile(SCALA_PATH, PROJECT_ROOT)
-    debuggers.push(await runDebugger(PROJECT_ROOT, '', PACKAGE_PATH))
+    debuggers.push(await runDebugger(PROJECT_ROOT, '', PACKAGE_PATH, 4711))
     debuggers.push(await runDebugger(PROJECT_ROOT, '', PACKAGE_PATH, 4712))
   })