Skip to content

Commit 10886ee

Browse files
aws-spencengaws-spenceng
committed
Updated with patch differences
1 parent 1fc7a76 commit 10886ee

File tree

29 files changed

+246
-106
lines changed

29 files changed

+246
-106
lines changed

‎patched-vscode/build/gulpfile.extensions.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ const compilations = [
6363
'php-language-features/tsconfig.json',
6464
'search-result/tsconfig.json',
6565
'references-view/tsconfig.json',
66+
'sagemaker-extension/tsconfig.json',
6667
'simple-browser/tsconfig.json',
6768
'tunnel-forwarding/tsconfig.json',
6869
'typescript-language-features/test-workspace/tsconfig.json',

‎patched-vscode/build/npm/dirs.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const dirs = [
3939
'extensions/npm',
4040
'extensions/php-language-features',
4141
'extensions/references-view',
42+
'extensions/sagemaker-extension',
4243
'extensions/search-result',
4344
'extensions/simple-browser',
4445
'extensions/tunnel-forwarding',

‎patched-vscode/extensions/git/package.nls.json‎

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

‎patched-vscode/product.json‎

Lines changed: 15 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"nameShort": "Code - OSS",
3-
"nameLong": "Code - OSS",
2+
"nameShort": "SageMaker Code Editor",
3+
"nameLong": "SageMaker Code Editor",
44
"applicationName": "code-oss",
55
"dataFolderName": ".vscode-oss",
66
"win32MutexName": "vscodeoss",
@@ -34,53 +34,17 @@
3434
"urlProtocol": "code-oss",
3535
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
3636
"builtInExtensions": [
37-
{
38-
"name": "ms-vscode.js-debug-companion",
39-
"version": "1.1.2",
40-
"sha256": "e034b8b41beb4e97e02c70f7175bd88abe66048374c2bd629f54bb33354bc2aa",
41-
"repo": "https://github.com/microsoft/vscode-js-debug-companion",
42-
"metadata": {
43-
"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
44-
"publisherId": {
45-
"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
46-
"publisherName": "ms-vscode",
47-
"displayName": "Microsoft",
48-
"flags": "verified"
49-
},
50-
"publisherDisplayName": "Microsoft"
51-
}
52-
},
53-
{
54-
"name": "ms-vscode.js-debug",
55-
"version": "1.83.1",
56-
"sha256": "1452fdbab8d0d83ca5765bb66170d50b005c97ca4dcd13e154c3401d842a92d4",
57-
"repo": "https://github.com/microsoft/vscode-js-debug",
58-
"metadata": {
59-
"id": "25629058-ddac-4e17-abba-74678e126c5d",
60-
"publisherId": {
61-
"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
62-
"publisherName": "ms-vscode",
63-
"displayName": "Microsoft",
64-
"flags": "verified"
65-
},
66-
"publisherDisplayName": "Microsoft"
67-
}
68-
},
69-
{
70-
"name": "ms-vscode.vscode-js-profile-table",
71-
"version": "1.0.3",
72-
"sha256": "b9dab017506d9e6a469a0f82b392e4cb1d7a25a4843f1db8ba396cbee209cfc5",
73-
"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
74-
"metadata": {
75-
"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
76-
"publisherId": {
77-
"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
78-
"publisherName": "ms-vscode",
79-
"displayName": "Microsoft",
80-
"flags": "verified"
81-
},
82-
"publisherDisplayName": "Microsoft"
83-
}
84-
}
37+
],
38+
"extensionsGallery": {
39+
"serviceUrl": "https://open-vsx.org/vscode/gallery",
40+
"itemUrl": "https://open-vsx.org/vscode/item",
41+
"resourceUrlTemplate": "https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}",
42+
"controlUrl": "",
43+
"recommendationsUrl": "",
44+
"nlsBaseUrl": "",
45+
"publisherUrl": ""
46+
},
47+
"linkProtectionTrustedDomains": [
48+
"https://open-vsx.org"
8549
]
86-
}
50+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ class RemoteAuthoritiesImpl {
168168
return URI.from({
169169
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
170170
authority: `${host}:${port}`,
171-
path: this._remoteResourcesPath,
171+
path: platform.isWeb
172+
? (window.location.pathname + "/" + this._remoteResourcesPath).replace(/\/\/+/g, "/")
173+
: this._remoteResourcesPath,
172174
query
173175
});
174176
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export type ExtensionVirtualWorkspaceSupport = {
5555
};
5656

5757
export interface IProductConfiguration {
58+
readonly rootEndpoint?: string
5859
readonly version: string;
5960
readonly date?: string;
6061
readonly quality?: string;

‎patched-vscode/src/vs/code/browser/workbench/workbench-dev.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
3939
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
4040
<script>
41-
const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
41+
const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
4242
Object.keys(self.webPackagePaths).map(function (key, index) {
4343
self.webPackagePaths[key] = `${baseUrl}/remote/web/node_modules/${key}/${self.webPackagePaths[key]}`;
4444
});

‎patched-vscode/src/vs/code/browser/workbench/workbench.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
3737
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
3838
<script>
39-
const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
39+
const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
4040
Object.keys(self.webPackagePaths).map(function (key, index) {
4141
self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
4242
});

‎patched-vscode/src/vs/code/browser/workbench/workbench.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ class LocalStorageURLCallbackProvider extends Disposable implements IURLCallback
304304
this.startListening();
305305
}
306306

307-
return URI.parse(window.location.href).with({ path: this._callbackRoute, query: queryParams.join('&') });
307+
const path = (window.location.pathname + "/" + this._callbackRoute).replace(/\/\/+/g, "/");
308+
return URI.parse(window.location.href).with({ path: path, query: queryParams.join('&') });
308309
}
309310

310311
private startListening(): void {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/platform/externalServices/common/service
1616
import { IStorageService } from 'vs/platform/storage/common/storage';
1717
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
1818
import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
19-
import { RemoteAuthorities } from 'vs/base/common/network';
2019
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
2120
import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
2221

@@ -102,7 +101,7 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
102101
: version,
103102
path: 'extension'
104103
}));
105-
return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
104+
return this._isWebExtensionResourceEndPoint(uri) ? URI.joinPath(URI.parse(window.location.href), uri.path) : uri;
106105
}
107106
return undefined;
108107
}

0 commit comments

Comments
 (0)