Skip to content

Commit da7d8b0

Browse files
code-ashercode-asher
committed
Update VS Code
1 parent 12bc26b commit da7d8b0

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ matrix:
88
- os: linux
99
dist: trusty
1010
env:
11-
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
11+
- VSCODE_VERSION="e8fc7db0d1e3f3a94b1cdcc136d146134b7a4c9a" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
1212
- os: linux
1313
dist: trusty
1414
env:
15-
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
15+
- VSCODE_VERSION="e8fc7db0d1e3f3a94b1cdcc136d146134b7a4c9a" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
1616
- os: osx
1717
env:
18-
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
18+
- VSCODE_VERSION="e8fc7db0d1e3f3a94b1cdcc136d146134b7a4c9a" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
1919
before_install:
2020
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
2121
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi

‎scripts/tasks.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ function in-vscode () {
207207

208208
function main() {
209209
local rootPath
210-
rootPath="$(cd "$(dirname "${0}/..")" ; pwd -P)"
210+
rootPath="$(cd "$(dirname "${0}")/.." ; pwd -P)"
211211

212212
local task="${1}" ; shift
213213
if [[ "${task}" == "ensure-in-vscode" ]] ; then

‎scripts/vscode.patch

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ index 4f93e06df0..ae63e64a7f 100644
108108
});
109109
}
110110
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
111-
index 07759dffe5..9148d7c1f0 100644
111+
index a657f4a4d9..76ae76127f 100644
112112
--- a/src/vs/base/common/platform.ts
113113
+++ b/src/vs/base/common/platform.ts
114114
@@ -54,8 +54,18 @@ if (typeof navigator === 'object' && !isElectronRenderer) {
@@ -133,10 +133,10 @@ index 07759dffe5..9148d7c1f0 100644
133133
_isWindows = (process.platform === 'win32');
134134
_isMacintosh = (process.platform === 'darwin');
135135
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
136-
index 44f67f0a0b..00fc1deea8 100644
136+
index 1d9a0b8308..d8204187c6 100644
137137
--- a/src/vs/code/browser/workbench/workbench.html
138138
+++ b/src/vs/code/browser/workbench/workbench.html
139-
@@ -18,10 +18,11 @@
139+
@@ -28,10 +28,11 @@
140140

141141
<!-- Workarounds/Hacks (remote user data uri) -->
142142
<meta id="vscode-remote-user-data-uri" data-settings="{{REMOTE_USER_DATA_URI}}">
@@ -217,7 +217,7 @@ index 2f09f53e43..ca969f19f6 100644
217217
});
218218
})();
219219
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
220-
index 3b45568e1b..aebe04ccfe 100644
220+
index cfb931c013..0767c9dad8 100644
221221
--- a/src/vs/platform/environment/common/environment.ts
222222
+++ b/src/vs/platform/environment/common/environment.ts
223223
@@ -82,6 +82,8 @@ export interface ParsedArgs {
@@ -237,10 +237,10 @@ index 3b45568e1b..aebe04ccfe 100644
237237
+ extraBuiltinExtensionPaths: string[];
238238
}
239239
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
240-
index a07c4c8f48..028ed19657 100644
240+
index 3eb487a5c4..14c1a2d022 100644
241241
--- a/src/vs/platform/environment/node/environmentService.ts
242242
+++ b/src/vs/platform/environment/node/environmentService.ts
243-
@@ -264,6 +264,15 @@ export class EnvironmentService implements IEnvironmentService {
243+
@@ -263,6 +263,15 @@ export class EnvironmentService implements IEnvironmentService {
244244

245245
get driverHandle(): string | undefined { return this._args['driver']; }
246246
get driverVerbose(): boolean { return !!this._args['driver-verbose']; }
@@ -257,7 +257,7 @@ index a07c4c8f48..028ed19657 100644
257257
constructor(private _args: ParsedArgs, private _execPath: string) {
258258
if (!process.env['VSCODE_LOGS']) {
259259
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
260-
index 7d0b568fc7..23ab257b42 100644
260+
index bab2df5a3f..5a4ebe24e7 100644
261261
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
262262
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
263263
@@ -731,11 +731,15 @@ export class ExtensionManagementService extends Disposable implements IExtension
@@ -331,7 +331,7 @@ index 7d0b568fc7..23ab257b42 100644
331331
const toRemove: ILocalExtension[] = [];
332332

333333
diff --git a/src/vs/platform/localizations/electron-browser/localizationsService.ts b/src/vs/platform/localizations/electron-browser/localizationsService.ts
334-
index add4dfb2fc..18fc71df51 100644
334+
index 57e62509c5..c2ea449c79 100644
335335
--- a/src/vs/platform/localizations/electron-browser/localizationsService.ts
336336
+++ b/src/vs/platform/localizations/electron-browser/localizationsService.ts
337337
@@ -6,7 +6,7 @@
@@ -340,10 +340,10 @@ index add4dfb2fc..18fc71df51 100644
340340
import { ILocalizationsService, LanguageType } from 'vs/platform/localizations/common/localizations';
341341
-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
342342
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
343-
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
344343

345344
export class LocalizationsService implements ILocalizationsService {
346-
@@ -15,8 +15,8 @@ export class LocalizationsService implements ILocalizationsService {
345+
346+
@@ -14,8 +14,8 @@ export class LocalizationsService implements ILocalizationsService {
347347

348348
private channel: IChannel;
349349

@@ -355,7 +355,7 @@ index add4dfb2fc..18fc71df51 100644
355355

356356
get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }
357357
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts
358-
index 9f68b645b6..1e224cc29a 100644
358+
index 5f631b8b9d..d145190881 100644
359359
--- a/src/vs/platform/log/common/logIpc.ts
360360
+++ b/src/vs/platform/log/common/logIpc.ts
361361
@@ -26,6 +26,7 @@ export class LogLevelSetterChannel implements IServerChannel {
@@ -410,7 +410,7 @@ index 6b24ec0781..43dd9c12c8 100644
410410
-
411411
-
412412
diff --git a/src/vs/platform/update/electron-browser/updateService.ts b/src/vs/platform/update/electron-browser/updateService.ts
413-
index bd8fa6cc18..cf6108a57b 100644
413+
index fe6e5be934..4b77f9953b 100644
414414
--- a/src/vs/platform/update/electron-browser/updateService.ts
415415
+++ b/src/vs/platform/update/electron-browser/updateService.ts
416416
@@ -6,7 +6,7 @@
@@ -419,10 +419,10 @@ index bd8fa6cc18..cf6108a57b 100644
419419
import { IUpdateService, State } from 'vs/platform/update/common/update';
420420
-import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
421421
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
422-
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
423422

424423
export class UpdateService implements IUpdateService {
425-
@@ -21,8 +21,8 @@ export class UpdateService implements IUpdateService {
424+
425+
@@ -20,8 +20,8 @@ export class UpdateService implements IUpdateService {
426426

427427
private channel: IChannel;
428428

@@ -434,7 +434,7 @@ index bd8fa6cc18..cf6108a57b 100644
434434
// always set this._state as the state changes
435435
this.onStateChange(state => this._state = state);
436436
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
437-
index d789bf4e09..e25c9c9d6a 100644
437+
index 7ae90deb9b..69f98f83be 100644
438438
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
439439
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
440440
@@ -6,7 +6,6 @@
@@ -525,7 +525,7 @@ index b99f800164..eb82443e74 100644
525525

526526
// Make the window active to handle the drop properly within
527527
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
528-
index 9fdeeeb1a1..db2dc002c3 100644
528+
index 80ae6faffc..511c05db2c 100644
529529
--- a/src/vs/workbench/browser/layout.ts
530530
+++ b/src/vs/workbench/browser/layout.ts
531531
@@ -260,7 +260,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
@@ -555,7 +555,7 @@ index 9fdeeeb1a1..db2dc002c3 100644
555555
}
556556

557557
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
558-
index f5944ce974..f2094de18b 100644
558+
index 2ef453c688..212e29ec8b 100644
559559
--- a/src/vs/workbench/browser/web.main.ts
560560
+++ b/src/vs/workbench/browser/web.main.ts
561561
@@ -45,6 +45,7 @@ import { FileLogService } from 'vs/platform/log/common/fileLogService';
@@ -583,7 +583,7 @@ index f5944ce974..f2094de18b 100644
583583
if (!this.configuration.userDataProvider) {
584584
const remoteUserDataUri = this.getRemoteUserDataUri();
585585
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
586-
index 895a8a0393..6530b66cbb 100644
586+
index caf44465e7..e6baaf5406 100644
587587
--- a/src/vs/workbench/browser/web.simpleservices.ts
588588
+++ b/src/vs/workbench/browser/web.simpleservices.ts
589589
@@ -33,6 +33,7 @@ import { localize } from 'vs/nls';
@@ -684,10 +684,10 @@ index 0c368120df..52ece63cd0 100644
684684
// Check for dropped external files to be folders
685685
const result = await this.fileService.resolveAll(droppedResources);
686686
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
687-
index 404f5a2a78..a04c825fa2 100644
687+
index 8ec38b3795..467c099d25 100644
688688
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
689689
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
690-
@@ -79,7 +79,8 @@ class RemoteChannelsContribution extends Disposable implements IWorkbenchContrib
690+
@@ -80,7 +80,8 @@ class RemoteChannelsContribution extends Disposable implements IWorkbenchContrib
691691
const connection = remoteAgentService.getConnection();
692692
if (connection) {
693693
const logLevelClient = new LogLevelSetterChannelClient(connection.getChannel('loglevel'));
@@ -698,24 +698,24 @@ index 404f5a2a78..a04c825fa2 100644
698698
}
699699
}
700700
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
701-
index 3534ef147d..216dc0604f 100644
701+
index dfad93af11..6da087895f 100644
702702
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
703703
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts
704-
@@ -34,7 +34,8 @@ self.addEventListener('activate', event => {
704+
@@ -85,7 +85,8 @@ self.addEventListener('activate', event => {
705705
//#region --- fetching/caching
706706

707707
const _cacheName = 'vscode-extension-resources';
708708
-const _resourcePrefix = '/vscode-remote-resource';
709-
+const rootPath = self.location.pathname.replace(/\/out\/vs\/workbench\/contrib\/resources\/browser\/resourceServiceWorkerMain.js$/, '');
709+
+const rootPath = (<any>self).location.pathname.replace(/\/out\/vs\/workbench\/contrib\/resources\/browser\/resourceServiceWorkerMain.js$/, '');
710710
+const _resourcePrefix = `${rootPath}/vscode-remote-resources`;
711711
const _pendingFetch = new Map<string, Function>();
712712

713713
self.addEventListener('message', event => {
714714
diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
715-
index 326dfb49ee..adf72747bd 100644
715+
index 935753f002..75c08ee013 100644
716716
--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
717717
+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorkerClient.ts
718-
@@ -18,7 +18,11 @@ class ResourceServiceWorker {
718+
@@ -15,7 +15,11 @@ class ResourceServiceWorker {
719719
constructor(
720720
@ILogService private readonly _logService: ILogService,
721721
) {
@@ -728,7 +728,7 @@ index 326dfb49ee..adf72747bd 100644
728728
this._logService.trace('SW#reg', reg);
729729
return reg.update();
730730
}).then(() => {
731-
@@ -45,5 +49,3 @@ Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkb
731+
@@ -32,5 +36,3 @@ Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkb
732732
ResourceServiceWorker,
733733
LifecyclePhase.Ready
734734
);
@@ -1017,10 +1017,10 @@ index 8493b87f2c..b5c47ea23f 100644
10171017
telemetryFrom: 'walkThrough'
10181018
};
10191019
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
1020-
index 7c3b6ae53e..18dec6effa 100644
1020+
index 6895dee469..762b8e0ee9 100644
10211021
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
10221022
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
1023-
@@ -177,6 +177,8 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
1023+
@@ -176,6 +176,8 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
10241024
driverHandle?: string;
10251025
driverVerbose: boolean;
10261026
galleryMachineIdResource?: URI;

‎src/upload.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as path from "vs/base/common/path";
55
import { URI } from "vs/base/common/uri";
66
import { generateUuid } from "vs/base/common/uuid";
77
import { IFileService } from "vs/platform/files/common/files";
8-
import { createDecorator, IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
8+
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
99
import { INotificationService, Severity } from "vs/platform/notification/common/notification";
1010
import { IProgress, IProgressService, IProgressStep, ProgressLocation } from "vs/platform/progress/common/progress";
1111
import { IWindowsService } from "vs/platform/windows/common/windows";
@@ -17,13 +17,13 @@ import { IEditorService } from "vs/workbench/services/editor/common/editorServic
1717
export const IUploadService = createDecorator<IUploadService>("uploadService");
1818

1919
export interface IUploadService {
20-
_serviceBrand: ServiceIdentifier<any>;
20+
_serviceBrand: undefined;
2121
handleDrop(event: DragEvent, resolveTargetGroup: () => IEditorGroup | undefined, afterDrop: (targetGroup: IEditorGroup | undefined) => void, targetIndex?: number): Promise<void>;
2222
handleExternalDrop(data: DesktopDragAndDropData, target: ExplorerItem, originalEvent: DragEvent): Promise<void>;
2323
}
2424

2525
export class UploadService extends Disposable implements IUploadService {
26-
public _serviceBrand: any;
26+
public _serviceBrand: undefined;
2727
public upload: Upload;
2828

2929
public constructor(

0 commit comments

Comments
 (0)