chore: Add rebasing rules for openssl related changes

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
Generated-by: Cursor AI

Author: RomanNikitenko

.rebase/replace/code/src/vs/platform/shell/node/shellEnv.ts.json

@@ -0,0 +1,14 @@
+[
+    {
+        "from": "import { clamp } from '../../../base/common/numbers.js';",
+        "by": "import { clamp } from '../../../base/common/numbers.js';\\\nimport { sanitizeLdLibraryPathInEnvironment, shouldStripLdLibraryPathForShellEnv } from '../../che/utils.js';"
+    },
+    {
+        "from": "const env = {",
+        "by": "const env: NodeJS.ProcessEnv = {"
+    },
+    {
+        "from": "delete env['VSCODE_RESOLVING_ENVIRONMENT'];",
+        "by": "delete env['VSCODE_RESOLVING_ENVIRONMENT'];\\\n\t\t\t\tif (shouldStripLdLibraryPathForShellEnv()) {\\\n\t\t\t\t\tsanitizeLdLibraryPathInEnvironment(env, message => logService.trace(message), 'shellEnv');\\\n\t\t\t\t}"
+    }
+]

.rebase/replace/code/src/vs/server/node/extensionHostConnection.ts.json

@@ -1,7 +1,7 @@
 [
     {
-        "from": "import { getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';",
-        "by": "import { getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';\\\nimport { getResolvedPathEnvVar } from 'vs/server/node/che/utils';"
+        "from": "import { getNLSConfiguration } from './remoteLanguagePacks.js';",
+        "by": "import { getNLSConfiguration } from './remoteLanguagePacks.js';\\\nimport { getResolvedPathEnvVar } from '../../platform/che/utils.js';"
     },
     {
         "from": "setCaseInsensitive(env, 'PATH', PATH);",

.rebase/replace/code/src/vs/server/node/remoteTerminalChannel.ts.json

@@ -0,0 +1,18 @@
+[
+    {
+        "from": "import { shouldUseEnvironmentVariableCollection } from '../../platform/terminal/common/terminalEnvironment.js';",
+        "by": "import { shouldUseEnvironmentVariableCollection } from '../../platform/terminal/common/terminalEnvironment.js';\\\nimport { sanitizeLdLibraryPathInEnvironment, shouldStripLdLibraryPathForTerminal } from '../../platform/che/utils.js';"
+    },
+    {
+        "from": "const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, this._environmentService, this._logService, this._configurationService);",
+        "by": "const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, this._environmentService, this._logService, this._configurationService);\\\n\t\tif (shouldStripLdLibraryPathForTerminal()) {\\\n\t\t\tsanitizeLdLibraryPathInEnvironment(baseEnv, message => this._logService.trace(message), 'remoteTerminalChannel:baseEnv');\\\n\t\t}"
+    },
+    {
+        "from": "// Apply extension environment variable collections to the environment",
+        "by": "if (shouldStripLdLibraryPathForTerminal()) {\\\n\t\t\tsanitizeLdLibraryPathInEnvironment(env, message => this._logService.trace(message), 'remoteTerminalChannel:terminalEnv');\\\n\t\t}\\\n\\\n\t\t// Apply extension environment variable collections to the environment"
+    },
+    {
+        "from": "return { ...process.env };",
+        "by": "const env: platform.IProcessEnvironment = { ...process.env };\\\n\t\tif (shouldStripLdLibraryPathForTerminal()) {\\\n\t\t\tsanitizeLdLibraryPathInEnvironment(env, message => this._logService.trace(message), 'remoteTerminalChannel:getEnvironment');\\\n\t\t}\\\n\t\treturn env;"
+    }
+]

rebase.sh

@@ -484,8 +484,12 @@ resolve_conflicts() {
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/server/node/serverEnvironmentService.ts" ]]; then
       apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/platform/shell/node/shellEnv.ts" ]]; then
+      apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/server/node/extensionHostConnection.ts" ]]; then
       apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/server/node/remoteTerminalChannel.ts" ]]; then
+      apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/code/browser/workbench/workbench.html" ]]; then
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/workbench.contribution.ts" ]]; then