Merge #2513

2513: Report correct original range in goto_definition r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 7 insertions, 1 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 95c3f42e5..fb9e55dd6 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -26,6 +26,8 @@ export class Config {
     public excludeGlobs = [];
     public useClientWatching = false;
     public featureFlags = {};
+    // for internal use
+    public withSysroot: null | boolean = null;
     public cargoWatchOptions: CargoWatchOptions = {
         enableOnStartup: 'ask',
         trace: 'off',
@@ -148,5 +150,8 @@ export class Config {
         if (config.has('featureFlags')) {
             this.featureFlags = config.get('featureFlags') || {};
         }
+        if (config.has('withSysroot')) {
+            this.withSysroot = config.get('withSysroot') || false;
+        }
     }
 }
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index b346c0828..e767b6f1b 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -57,7 +57,8 @@ export class Server {
                 maxInlayHintLength: Server.config.maxInlayHintLength,
                 excludeGlobs: Server.config.excludeGlobs,
                 useClientWatching: Server.config.useClientWatching,
-                featureFlags: Server.config.featureFlags
+                featureFlags: Server.config.featureFlags,
+                withSysroot: Server.config.withSysroot
             },
             traceOutputChannel
         };