Skip to content

Commit 40d8637

Browse files
aws-ajanggaws-ajangg
committed
Resolve merge conflict with 1.8
2 parents 825782e + e1451a8 commit 40d8637

File tree

6 files changed

+4
-169
lines changed

6 files changed

+4
-169
lines changed

‎patched-vscode/src/vs/base/common/platform.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,9 @@ else if (typeof navigator === 'object' && !isElectronRenderer) {
108108
_isLinux = _userAgent.indexOf('Linux') >= 0;
109109
_isMobile = _userAgent?.indexOf('Mobi') >= 0;
110110
_isWeb = true;
111-
<<<<<<< HEAD
112111
_locale = LANGUAGE_DEFAULT;
113112
_language = _locale;
114113
_platformLocale = navigator.language;
115-
=======
116-
117-
_locale = LANGUAGE_DEFAULT;
118-
_language = _locale;
119-
_platformLocale = navigator.language;
120-
>>>>>>> 34c670ba (Update patched-vscode)
121114
const el = typeof document !== 'undefined' && document.getElementById('vscode-remote-nls-configuration');
122115
const rawNlsConfig = el && el.getAttribute('data-settings');
123116
if (rawNlsConfig) {

‎patched-vscode/src/vs/platform/languagePacks/browser/languagePacks.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
<<<<<<< HEAD
76
import { CancellationTokenSource } from '../../../base/common/cancellation.js';
87
import { URI } from '../../../base/common/uri.js';
98
import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
@@ -12,16 +11,6 @@ import { IExtensionResourceLoaderService } from '../../extensionResourceLoader/c
1211
import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from '../common/languagePacks.js';
1312
import { ILogService } from '../../log/common/log.js';
1413
import { IRemoteAgentService } from '../../../workbench/services/remote/common/remoteAgentService.js';
15-
=======
16-
import { CancellationTokenSource } from 'vs/base/common/cancellation';
17-
import { URI } from 'vs/base/common/uri';
18-
import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
19-
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
20-
import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
21-
import { ILanguagePackItem, ILanguagePackService, LanguagePackBaseService } from 'vs/platform/languagePacks/common/languagePacks';
22-
import { ILogService } from 'vs/platform/log/common/log';
23-
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
24-
>>>>>>> 34c670ba (Update patched-vscode)
2514

2615
export class WebLanguagePacksService extends LanguagePackBaseService {
2716
private readonly languagePackService: ILanguagePackService;

‎patched-vscode/src/vs/server/node/serverServices.ts‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { hostname, release } from 'os';
7-
<<<<<<< HEAD
87
import { Emitter, Event } from '../../base/common/event.js';
98
import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
109
import { Schemas } from '../../base/common/network.js';
@@ -86,81 +85,6 @@ import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeM
8685
import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
8786
import { IExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifest.js';
8887
import { ExtensionGalleryManifestIPCService } from '../../platform/extensionManagement/common/extensionGalleryManifestServiceIpc.js';
89-
=======
90-
import { Emitter, Event } from 'vs/base/common/event';
91-
import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
92-
import { Schemas } from 'vs/base/common/network';
93-
import * as path from 'vs/base/common/path';
94-
import { IURITransformer } from 'vs/base/common/uriIpc';
95-
import { getMachineId, getSqmMachineId, getdevDeviceId } from 'vs/base/node/id';
96-
import { Promises } from 'vs/base/node/pfs';
97-
import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
98-
import { ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
99-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
100-
import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
101-
import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
102-
import { IDownloadService } from 'vs/platform/download/common/download';
103-
import { DownloadServiceChannelClient } from 'vs/platform/download/common/downloadIpc';
104-
import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
105-
import { ExtensionGalleryServiceWithNoStorageService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
106-
import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
107-
import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService';
108-
import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI';
109-
import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
110-
import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
111-
import { IFileService } from 'vs/platform/files/common/files';
112-
import { FileService } from 'vs/platform/files/common/fileService';
113-
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
114-
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
115-
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
116-
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
117-
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
118-
import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks';
119-
import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks';
120-
import { AbstractLogger, DEFAULT_LOG_LEVEL, getLogLevel, ILoggerService, ILogService, log, LogLevel, LogLevelToString } from 'vs/platform/log/common/log';
121-
import product from 'vs/platform/product/common/product';
122-
import { IProductService } from 'vs/platform/product/common/productService';
123-
import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
124-
import { IRequestService } from 'vs/platform/request/common/request';
125-
import { RequestChannel } from 'vs/platform/request/common/requestIpc';
126-
import { RequestService } from 'vs/platform/request/node/requestService';
127-
import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
128-
import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
129-
import { ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
130-
import { getPiiPathsFromEnvironment, isInternalTelemetry, isLoggingOnly, ITelemetryAppender, NullAppender, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
131-
import ErrorTelemetry from 'vs/platform/telemetry/node/errorTelemetry';
132-
import { IPtyService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
133-
import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
134-
import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
135-
import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
136-
import { RemoteAgentEnvironmentChannel } from 'vs/server/node/remoteAgentEnvironmentImpl';
137-
import { RemoteAgentFileSystemProviderChannel } from 'vs/server/node/remoteFileSystemProviderServer';
138-
import { ServerTelemetryChannel } from 'vs/platform/telemetry/common/remoteTelemetryChannel';
139-
import { IServerTelemetryService, ServerNullTelemetryService, ServerTelemetryService } from 'vs/platform/telemetry/common/serverTelemetryService';
140-
import { RemoteTerminalChannel } from 'vs/server/node/remoteTerminalChannel';
141-
import { createURITransformer } from 'vs/workbench/api/node/uriTransformer';
142-
import { ServerConnectionToken } from 'vs/server/node/serverConnectionToken';
143-
import { ServerEnvironmentService, ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
144-
import { REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel';
145-
import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/workbench/services/remote/common/remoteFileSystemProviderClient';
146-
import { ExtensionHostStatusService, IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
147-
import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
148-
import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerService';
149-
import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
150-
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
151-
import { NullPolicyService } from 'vs/platform/policy/common/policy';
152-
import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
153-
import { LoggerService } from 'vs/platform/log/node/loggerService';
154-
import { ServerUserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile';
155-
import { ExtensionsProfileScannerService } from 'vs/platform/extensionManagement/node/extensionsProfileScannerService';
156-
import { LogService } from 'vs/platform/log/common/logService';
157-
import { LoggerChannel } from 'vs/platform/log/common/logIpc';
158-
import { localize } from 'vs/nls';
159-
import { RemoteExtensionsScannerChannel, RemoteExtensionsScannerService } from 'vs/server/node/remoteExtensionsScanner';
160-
import { RemoteExtensionsScannerChannelName } from 'vs/platform/remote/common/remoteExtensionsScanner';
161-
import { RemoteUserDataProfilesServiceChannel } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
162-
import { NodePtyHostStarter } from 'vs/platform/terminal/node/nodePtyHostStarter';
163-
>>>>>>> 34c670ba (Update patched-vscode)
16488

16589
const eventPrefix = 'monacoworkbench';
16690

‎patched-vscode/src/vs/server/node/webClientServer.ts‎

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,13 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
<<<<<<< HEAD
76
import { createReadStream, promises, existsSync, writeFileSync } from 'fs';
8-
=======
9-
import { createReadStream, existsSync, writeFileSync } from 'fs';
10-
import {readFile } from 'fs/promises';
11-
import { Promises } from 'vs/base/node/pfs';
12-
import * as path from 'path';
13-
>>>>>>> 34c670ba (Update patched-vscode)
147
import * as http from 'http';
158
import { spawn } from 'child_process';
169
import * as fs from 'fs';
1710
import * as url from 'url';
1811
import * as cookie from 'cookie';
1912
import * as crypto from 'crypto';
20-
<<<<<<< HEAD
2113
import { isEqualOrParent } from '../../base/common/extpath.js';
2214
import { getMediaMime } from '../../base/common/mime.js';
2315
import { isLinux } from '../../base/common/platform.js';
@@ -38,28 +30,6 @@ import { isString, Mutable } from '../../base/common/types.js';
3830
import { CharCode } from '../../base/common/charCode.js';
3931
import { IExtensionManifest } from '../../platform/extensions/common/extensions.js';
4032
import { ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
41-
=======
42-
import { isEqualOrParent } from 'vs/base/common/extpath';
43-
import { getMediaMime } from 'vs/base/common/mime';
44-
import { isLinux } from 'vs/base/common/platform';
45-
import { ILogService } from 'vs/platform/log/common/log';
46-
import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
47-
import { extname, dirname, join, normalize } from 'vs/base/common/path';
48-
import { FileAccess, connectionTokenCookieName, connectionTokenQueryName, Schemas, builtinExtensionsPath } from 'vs/base/common/network';
49-
import { generateUuid } from 'vs/base/common/uuid';
50-
import { IProductService } from 'vs/platform/product/common/productService';
51-
import { ServerConnectionToken, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
52-
import { asTextOrError, IRequestService } from 'vs/platform/request/common/request';
53-
import { IHeaders } from 'vs/base/parts/request/common/request';
54-
import { CancellationToken } from 'vs/base/common/cancellation';
55-
import { URI } from 'vs/base/common/uri';
56-
import { streamToBuffer } from 'vs/base/common/buffer';
57-
import { IProductConfiguration } from 'vs/base/common/product';
58-
import { isString } from 'vs/base/common/types';
59-
import { getLocaleFromConfig, getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
60-
import { CharCode } from 'vs/base/common/charCode';
61-
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
62-
>>>>>>> 34c670ba (Update patched-vscode)
6333

6434
const textMimeType: { [ext: string]: string | undefined } = {
6535
'.html': 'text/html',
@@ -408,7 +378,6 @@ export class WebClientServer {
408378
callbackRoute: callbackRoute
409379
};
410380

411-
<<<<<<< HEAD
412381
const cookies = cookie.parse(req.headers.cookie || '');
413382
const locale = cookies['vscode.nls.locale'] || req.headers['accept-language']?.split(',')[0]?.toLowerCase() || 'en';
414383
let WORKBENCH_NLS_BASE_URL: string | undefined;
@@ -426,19 +395,6 @@ export class WebClientServer {
426395
WORKBENCH_WEB_BASE_URL: staticRoute,
427396
WORKBENCH_NLS_URL,
428397
WORKBENCH_NLS_FALLBACK_URL: `${staticRoute}/out/nls.messages.js`
429-
=======
430-
const locale = this._environmentService.args.locale || await getLocaleFromConfig(this._environmentService.argvResource.fsPath);
431-
const nlsConfiguration = await getNLSConfiguration(locale, this._environmentService.userDataPath)
432-
const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
433-
const values: { [key: string]: string } = {
434-
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
435-
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
436-
WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
437-
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
438-
BASE: base,
439-
VS_BASE: vscodeBase,
440-
NLS_CONFIGURATION: asJSON(nlsConfiguration),
441-
>>>>>>> 34c670ba (Update patched-vscode)
442398
};
443399

444400
// DEV ---------------------------------------------------------------------------------------
@@ -480,11 +436,7 @@ export class WebClientServer {
480436
`frame-src 'self' https://*.vscode-cdn.net data:;`,
481437
'worker-src \'self\' data: blob:;',
482438
'style-src \'self\' \'unsafe-inline\';',
483-
<<<<<<< HEAD
484439
'connect-src \'self\' ws: wss: https://main.vscode-cdn.net http://localhost:* https://localhost:* https://login.microsoftonline.com/ https://update.code.visualstudio.com https://*.vscode-unpkg.net/ https://default.exp-tas.com/vscode/ab https://vscode-sync.trafficmanager.net https://vscode-sync-insiders.trafficmanager.net https://*.gallerycdn.vsassets.io https://marketplace.visualstudio.com https://openvsxorg.blob.core.windows.net https://az764295.vo.msecnd.net https://code.visualstudio.com https://*.gallery.vsassets.io https://*.rel.tunnels.api.visualstudio.com wss://*.rel.tunnels.api.visualstudio.com https://*.servicebus.windows.net/ https://vscode.blob.core.windows.net https://vscode.search.windows.net https://vsmarketplacebadges.dev https://vscode.download.prss.microsoft.com https://download.visualstudio.microsoft.com https://*.vscode-unpkg.net https://open-vsx.org;',
485-
=======
486-
'connect-src \'self\' ws: wss: https://main.vscode-cdn.net http://localhost:* https://localhost:* https://login.microsoftonline.com/ https://update.code.visualstudio.com https://*.vscode-unpkg.net/ https://default.exp-tas.com/vscode/ab https://vscode-sync.trafficmanager.net https://vscode-sync-insiders.trafficmanager.net https://*.gallerycdn.vsassets.io https://marketplace.visualstudio.com https://*.blob.core.windows.net https://az764295.vo.msecnd.net https://code.visualstudio.com https://*.gallery.vsassets.io https://*.rel.tunnels.api.visualstudio.com wss://*.rel.tunnels.api.visualstudio.com https://*.servicebus.windows.net/ https://vscode.blob.core.windows.net https://vscode.search.windows.net https://vsmarketplacebadges.dev https://vscode.download.prss.microsoft.com https://download.visualstudio.microsoft.com https://*.vscode-unpkg.net https://open-vsx.org;',
487-
>>>>>>> 34c670ba (Update patched-vscode)
488440
'font-src \'self\' blob:;',
489441
'manifest-src \'self\';'
490442
].join(' ');
@@ -553,30 +505,12 @@ export class WebClientServer {
553505
}
554506

555507
/**
556-
<<<<<<< HEAD
557508
* Handles API requests to run the post-startup script in SMD.
558509
*/
559510
private async _handlePostStartupScriptInvocation(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
560511
const postStartupScriptPath = '/etc/sagemaker-ui/sagemaker_ui_post_startup.sh'
561512
const logPath = '/var/log/apps/post_startup_default.log';
562513
const logStream = fs.createWriteStream(logPath, { flags: 'a' });
563-
=======
564-
* Handles API requests to retrieve the last activity timestamp.
565-
*/
566-
private async _handleIdle(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
567-
try {
568-
const tmpDirectory = '/tmp/'
569-
const idleFilePath = path.join(tmpDirectory, '.sagemaker-last-active-timestamp');
570-
571-
// If idle shutdown file does not exist, this indicates the app UI may never been opened
572-
// Create the initial metadata file
573-
if (!existsSync(idleFilePath)) {
574-
const timestamp = new Date().toISOString();
575-
writeFileSync(idleFilePath, timestamp);
576-
}
577-
578-
const data = await readFile(idleFilePath, 'utf8');
579-
>>>>>>> 34c670ba (Update patched-vscode)
580514

581515
// Only trigger post-startup script invocation for SageMakerUnifiedStudio app.
582516
if (process.env['SERVICE_NAME'] != ServiceName.SAGEMAKER_UNIFIED_STUDIO) {
@@ -629,4 +563,4 @@ export class WebClientServer {
629563
serveError(req, res, 500, error.message)
630564
}
631565
}
632-
}
566+
}

‎patched-vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ export class InstallAction extends ExtensionAction {
475475
if (this.extension.isBuiltin) {
476476
return;
477477
}
478-
<<<<<<< HEAD
479478
if (this.extension.state !== ExtensionState.Uninstalled) {
480479
return;
481480
}
@@ -489,10 +488,6 @@ export class InstallAction extends ExtensionAction {
489488
this.class = InstallAction.CLASS;
490489
if (await this.extensionsWorkbenchService.canInstall(this.extension) === true) {
491490
this.enabled = true;
492-
=======
493-
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
494-
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
495-
>>>>>>> 34c670ba (Update patched-vscode)
496491
this.updateLabel();
497492
}
498493
}
@@ -3215,4 +3210,4 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
32153210
collector.addRule(`.extension-editor .body .subcontent .runtime-status ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
32163211
collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(infoIcon)} { color: ${infoColor}; }`);
32173212
}
3218-
});
3213+
});

‎patches/sagemaker-ui-post-startup.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
1111
import * as url from 'url';
1212
import * as cookie from 'cookie';
1313
import * as crypto from 'crypto';
14-
@@ -38,6 +38,10 @@ const textMimeType: { [ext: string]: st
14+
@@ -37,6 +39,10 @@ const textMimeType: { [ext: string]: str
1515
'.svg': 'image/svg+xml',
1616
};
1717

@@ -30,7 +30,7 @@ Index: sagemaker-code-editor/vscode/src/vs/server/node/webClientServer.ts
3030

3131
export class WebClientServer {
3232

33-
@@ -137,6 +144,9 @@ export class WebClientServer {
33+
@@ -134,6 +141,9 @@ export class WebClientServer {
3434
if (pathname === IDLE_EXTENSION_PATH) {
3535
return this._handleIdle(req, res);
3636
}

0 commit comments

Comments
 (0)