Merge pull request #171 from aws/feature/base-path-compatibility

Fix base-path-compatibility patch for VS Code 1.100.2

Author: aakashmandavilli96

patched-vscode/src/vs/server/node/serverEnvironmentService.ts

@@ -3,20 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import * as nls from '../../nls.js';
 
-import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { OPTIONS, OptionDescriptions } from 'vs/platform/environment/node/argv';
-import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { memoize } from 'vs/base/common/decorators';
-import { URI } from 'vs/base/common/uri';
+import { NativeEnvironmentService } from '../../platform/environment/node/environmentService.js';
+import { OPTIONS, OptionDescriptions } from '../../platform/environment/node/argv.js';
+import { refineServiceDecorator } from '../../platform/instantiation/common/instantiation.js';
+import { IEnvironmentService, INativeEnvironmentService } from '../../platform/environment/common/environment.js';
+import { IProductService } from '../../platform/product/common/productService.js';
+import { memoize } from '../../base/common/decorators.js';
+import { URI } from '../../base/common/uri.js';
 
 export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
-	'locale': { type: 'string' },
-
 	/* ----- server setup ----- */
 
 	'host': { type: 'string', cat: 'o', args: 'ip-address', description: nls.localize('host', "The host name or IP address the server should listen to. If not set, defaults to 'localhost'.") },
@@ -43,6 +41,7 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'log': OPTIONS['log'],
 	'logsPath': OPTIONS['logsPath'],
 	'force-disable-user-env': OPTIONS['force-disable-user-env'],
+	'enable-proposed-api': OPTIONS['enable-proposed-api'],
 
 	/* ----- vs code web options ----- */
 
@@ -72,6 +71,7 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'category': OPTIONS['category'],
 	'force': OPTIONS['force'],
 	'do-not-sync': OPTIONS['do-not-sync'],
+	'do-not-include-pack-dependencies': OPTIONS['do-not-include-pack-dependencies'],
 	'pre-release': OPTIONS['pre-release'],
 	'start-server': { type: 'boolean', cat: 'e', description: nls.localize('start-server', "Start the server when installing or uninstalling extensions. To be used in combination with 'install-extension', 'install-builtin-extension' and 'uninstall-extension'.") },
 
@@ -100,8 +100,6 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
 export interface ServerParsedArgs {
 
-	'locale'?: string;
-
 	/* ----- server setup ----- */
 
 	host?: string;
@@ -170,6 +168,7 @@ export interface ServerParsedArgs {
 	'logsPath'?: string;
 
 	'force-disable-user-env'?: boolean;
+	'enable-proposed-api'?: string[];
 
 	/* ----- vs code web options ----- */
 
@@ -202,6 +201,8 @@ export interface ServerParsedArgs {
 	force?: boolean; // used by install-extension
 	'do-not-sync'?: boolean; // used by install-extension
 	'pre-release'?: boolean; // used by install-extension
+	'do-not-include-pack-dependencies'?: boolean; // used by install-extension
+
 
 	'start-server'?: boolean;
 
@@ -246,4 +247,4 @@ export class ServerEnvironmentService extends NativeEnvironmentService implement
 	@memoize
 	override get userRoamingDataHome(): URI { return this.appSettingsHome; }
 	override get args(): ServerParsedArgs { return super.args as ServerParsedArgs; }
-}
+}

patches/base-path-compatibility.diff

@@ -2,37 +2,39 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.
 ===================================================================
 --- sagemaker-code-editor.orig/vscode/src/vs/server/node/serverEnvironmentService.ts
 +++ sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.ts
-@@ -11,6 +11,7 @@ import { OPTIONS, OptionDescriptions } from 'vs/platform/environment/node/argv'
- import { refineServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
- import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-+import { IProductService } from 'vs/platform/product/common/productService';
- import { memoize } from 'vs/base/common/decorators';
- import { URI } from 'vs/base/common/uri';
+@@ -9,6 +9,7 @@
+ import { OPTIONS, OptionDescriptions } from '../../platform/environment/node/argv.js';
+ import { refineServiceDecorator } from '../../platform/instantiation/common/instantiation.js';
+ import { IEnvironmentService, INativeEnvironmentService } from '../../platform/environment/common/environment.js';
++import { IProductService } from '../../platform/product/common/productService.js';
+ import { memoize } from '../../base/common/decorators.js';
+ import { URI } from '../../base/common/uri.js';
 
-@@ -89,6 +90,9 @@ export const serverOptions: OptionDescri
+@@ -91,6 +92,9 @@
 
  	'compatibility': { type: 'string' },
 
-+	/* ----- sagemaker compatibility ----- */
++	/* ----- sagemaker ----- */
 +	'base-path': { type: 'string' },
 +
  	_: OPTIONS['_']
  };
 
-@@ -212,6 +215,9 @@ export interface ServerParsedArgs {
+@@ -217,6 +221,9 @@
 
  	compatibility: string;
 
-+	/* ----- sagemaker compatibility ----- */
++	/* ----- sagemaker ----- */
 +	'base-path'?: string,
 +
  	_: string[];
  }
 
-@@ -234,6 +240,12 @@ export interface IServerEnvironmentService extends INativeEnvironmentService {
+@@ -227,7 +234,17 @@
+ }
 
  export class ServerEnvironmentService extends NativeEnvironmentService implements IServerEnvironmentService {
- 
++
 +	constructor(args: ServerParsedArgs, productService: IProductService) {
 +		/* ----- sagemaker compatibility: map --base-path to --server-base-path ----- */
 +		if (args['base-path']) {
@@ -44,4 +46,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/serverEnvironmentService.
 +
  	@memoize
  	override get userRoamingDataHome(): URI { return this.appSettingsHome; }
- 	override get args(): ServerParsedArgs { return super.args as ServerParsedArgs; }
+ 	override get args(): ServerParsedArgs { return super.args as ServerParsedArgs; }
+-}
++}
+\ No newline at end of file