From 81ef329d3a7531abcdadcbe10f231391b5406791 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Fri, 22 Dec 2023 13:06:54 +0100 Subject: [PATCH] Fixed displaying file location when error thrown --- apps/circuit-compiler/src/app/app.tsx | 6 ++++-- .../circuit-compiler/src/app/services/circomPluginClient.ts | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/circuit-compiler/src/app/app.tsx b/apps/circuit-compiler/src/app/app.tsx index 434d9cd23a..d7c8c8680b 100644 --- a/apps/circuit-compiler/src/app/app.tsx +++ b/apps/circuit-compiler/src/app/app.tsx @@ -70,11 +70,13 @@ function App() { dispatch({ type: 'SET_FILE_PATH_TO_ID', payload: filePathToId }) dispatch({ type: 'SET_COMPILER_FEEDBACK', payload: null }) }) - plugin.internalEvents.on('circuit_parsing_errored', (report) => { + plugin.internalEvents.on('circuit_parsing_errored', (report, filePathToId) => { + dispatch({ type: 'SET_FILE_PATH_TO_ID', payload: filePathToId }) dispatch({ type: 'SET_COMPILER_STATUS', payload: 'errored' }) dispatch({ type: 'SET_COMPILER_FEEDBACK', payload: report }) }) - plugin.internalEvents.on('circuit_parsing_warning', (report) => { + plugin.internalEvents.on('circuit_parsing_warning', (report, filePathToId) => { + dispatch({ type: 'SET_FILE_PATH_TO_ID', payload: filePathToId }) dispatch({ type: 'SET_COMPILER_STATUS', payload: 'warning' }) dispatch({ type: 'SET_COMPILER_FEEDBACK', payload: report }) }) diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts index 947649042d..0869d54012 100644 --- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts +++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts @@ -127,10 +127,10 @@ export class CircomPluginClient extends PluginClient { if (parseErrors && (parseErrors.length > 0)) { if (parseErrors[0].type === 'Error') { - this.internalEvents.emit('circuit_parsing_errored', parseErrors) + this.internalEvents.emit('circuit_parsing_errored', parseErrors, filePathToId) return } else if (parseErrors[0].type === 'Warning') { - this.internalEvents.emit('circuit_parsing_warning', parseErrors) + this.internalEvents.emit('circuit_parsing_warning', parseErrors, filePathToId) } } else { this.internalEvents.emit('circuit_parsing_done', parseErrors, filePathToId)