Skip to content

Insert and remove quotes around pathing for debugger where appropriat… #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JeremyYao wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Insert and remove quotes around pathing for debugger where appropriat… #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debugger/src/templates/bat-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if defined DAFFODIL_DEBUG_CLASSPATH (


rem Call the application and pass all arguments unchanged.
"%_JAVACMD%" !_JAVA_OPTS! !DAFFODIL_DEBUGGER_OPTS! -cp "%NEW_CLASSPATH%" %MAIN_CLASS% !_APP_ARGS!
"%_JAVACMD%" !_JAVA_OPTS! !DAFFODIL_DEBUGGER_OPTS! -cp %NEW_CLASSPATH% %MAIN_CLASS% !_APP_ARGS!

@endlocal

Expand Down
5 changes: 5 additions & 0 deletions src/dataEditor/dataEditorClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,11 @@ async function serverStart() {
throw new Error(`Log config file '${logConfigFile}' not found`)
}

const x = OMEGA_EDIT_HOST
const y = getPidFile(omegaEditPort)
const z = logConfigFile

console.log(x, y, z)
// Start the server and wait up to 10 seconds for it to start
const serverPid = (await Promise.race([
startServer(
Expand Down
9 changes: 4 additions & 5 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,10 @@ export async function runScript(
const terminal = getTerminal(hideTerminal, env, createTerminal)

// Create debugger run command
const fullPathToScript = path
.join(scriptPath, 'bin', scriptName)
// fix pathing as emtpy space needs a \ before it to not cause errors
.replace(' ', '\\ ')
const debuggerRunCommand = `${fullPathToScript} ${shellArgs.join(' ')}`
const fullPathToScript = path.join(scriptPath, 'bin', scriptName)

// Surround path to script with quotes to account for spaces
const debuggerRunCommand = `"${fullPathToScript}" ${shellArgs.join(' ')}`

// Send debugger run command to terminal, when exists terminal will stay open
terminal.sendText(debuggerRunCommand)
Expand Down
Loading