Fix #745

vadimcn · Aug 14, 2022 · bc36db0 · bc36db0
1 parent c89f088
commit bc36db0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+# 1.7.4
+
+## Fixed
+- #745: Bug: didn't catch panics in Rust code
+
 # 1.7.3
 
 ## Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 project(CodeLLDB)
 enable_testing()
 
-set(VERSION "1.7.3") # Base version
+set(VERSION "1.7.4") # Base version
 
 include(cmake/CopyFiles.cmake)
 

diff --git a/extension/main.ts b/extension/main.ts
@@ -408,10 +408,6 @@ class Extension implements DebugConfigurationProvider, DebugAdapterDescriptorFac
         }
 
         launchConfig._adapterSettings = this.getAdapterSettings();
-        if (launchConfig.sourceLanguages) {
-            launchConfig._adapterSettings.sourceLanguages = launchConfig.sourceLanguages;
-            delete launchConfig.sourceLanguages;
-        }
 
         output.appendLine(`Resolved debug configuration: ${inspect(launchConfig)}`);
         return launchConfig;
@@ -423,6 +419,11 @@ class Extension implements DebugConfigurationProvider, DebugAdapterDescriptorFac
             evaluateForHovers: settings.evaluateForHovers,
             commandCompletions: settings.commandCompletions,
         };
+        if (session.configuration.sourceLanguages) {
+            adapterParams.sourceLanguages = session.configuration.sourceLanguages;
+            delete session.configuration.sourceLanguages;
+        }
+
         let connector = new ReverseAdapterConnector();
         let port = await connector.listen();