@codingame/monaco-vscode-edit-sessions-service-override 4.5.0 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +1 -1
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.js +156 -272
- package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsFileSystemProvider.js +1 -1
- package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.js +77 -93
- package/vscode/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.js +69 -101
- package/vscode/src/vs/workbench/contrib/editSessions/common/editSessions.js +13 -24
- package/vscode/src/vs/workbench/contrib/editSessions/common/editSessionsLogService.js +6 -9
- package/vscode/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.js +3 -3
- package/vscode/src/vs/workbench/services/workspaces/common/editSessionIdentityService.js +1 -1
- package/editSessions.d.ts +0 -5
|
@@ -22,8 +22,9 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
|
22
22
|
import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
|
|
23
23
|
import { basename } from 'vscode/vscode/vs/base/common/path';
|
|
24
24
|
|
|
25
|
+
const _moduleId = "vs/workbench/contrib/editSessions/browser/editSessionsViews";
|
|
25
26
|
const EDIT_SESSIONS_COUNT_KEY = 'editSessionsCount';
|
|
26
|
-
const EDIT_SESSIONS_COUNT_CONTEXT_KEY = ( new RawContextKey(EDIT_SESSIONS_COUNT_KEY, 0));
|
|
27
|
+
const EDIT_SESSIONS_COUNT_CONTEXT_KEY = ( (new RawContextKey(EDIT_SESSIONS_COUNT_KEY, 0)));
|
|
27
28
|
let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
28
29
|
constructor(container, instantiationService) {
|
|
29
30
|
super();
|
|
@@ -36,52 +37,47 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
36
37
|
treeView.showCollapseAllAction = true;
|
|
37
38
|
treeView.showRefreshAction = true;
|
|
38
39
|
treeView.dataProvider = this.instantiationService.createInstance(EditSessionDataViewDataProvider);
|
|
39
|
-
const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
|
|
40
|
+
const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
|
|
40
41
|
viewsRegistry.registerViews([{
|
|
41
42
|
id: viewId,
|
|
42
43
|
name: EDIT_SESSIONS_TITLE,
|
|
43
|
-
ctorDescriptor: ( new SyncDescriptor(TreeViewPane)),
|
|
44
|
+
ctorDescriptor: ( (new SyncDescriptor(TreeViewPane))),
|
|
44
45
|
canToggleVisibility: true,
|
|
45
46
|
canMoveView: false,
|
|
46
47
|
treeView,
|
|
47
48
|
collapsed: false,
|
|
48
|
-
when: ( ContextKeyExpr.and(EDIT_SESSIONS_SHOW_VIEW)),
|
|
49
|
+
when: ( (ContextKeyExpr.and(EDIT_SESSIONS_SHOW_VIEW))),
|
|
49
50
|
order: 100,
|
|
50
51
|
hideByDefault: true,
|
|
51
52
|
}], container);
|
|
52
53
|
viewsRegistry.registerViewWelcomeContent(viewId, {
|
|
53
54
|
content: ( localizeWithPath(
|
|
54
|
-
|
|
55
|
-
|
|
55
|
+
_moduleId,
|
|
56
|
+
0,
|
|
56
57
|
'You have no stored changes in the cloud to display.\n{0}',
|
|
57
|
-
`[${( localizeWithPath(
|
|
58
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
59
|
-
'storeWorkingChangesTitle',
|
|
60
|
-
'Store Working Changes'
|
|
61
|
-
))}](command:workbench.editSessions.actions.store)`
|
|
58
|
+
`[${( localizeWithPath(_moduleId, 1, 'Store Working Changes'))}](command:workbench.editSessions.actions.store)`
|
|
62
59
|
)),
|
|
63
|
-
when: ( ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0)),
|
|
60
|
+
when: ( (ContextKeyExpr.equals(EDIT_SESSIONS_COUNT_KEY, 0))),
|
|
64
61
|
order: 1
|
|
65
62
|
});
|
|
66
63
|
this._register(registerAction2(class extends Action2 {
|
|
67
64
|
constructor() {
|
|
68
65
|
super({
|
|
69
66
|
id: 'workbench.editSessions.actions.resume',
|
|
70
|
-
title: ( localizeWithPath(
|
|
71
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
72
|
-
'workbench.editSessions.actions.resume.v2',
|
|
73
|
-
"Resume Working Changes"
|
|
74
|
-
)),
|
|
67
|
+
title: ( localizeWithPath(_moduleId, 2, "Resume Working Changes")),
|
|
75
68
|
icon: Codicon.desktopDownload,
|
|
76
69
|
menu: {
|
|
77
70
|
id: MenuId.ViewItemContext,
|
|
78
|
-
when: ( ContextKeyExpr.and(
|
|
71
|
+
when: ( (ContextKeyExpr.and(
|
|
72
|
+
(ContextKeyExpr.equals('view', viewId)),
|
|
73
|
+
(ContextKeyExpr.regex('viewItem', /edit-session/i))
|
|
74
|
+
))),
|
|
79
75
|
group: 'inline'
|
|
80
76
|
}
|
|
81
77
|
});
|
|
82
78
|
}
|
|
83
79
|
async run(accessor, handle) {
|
|
84
|
-
const editSessionId = ( URI.parse(handle.$treeItemHandle)).path.substring(1);
|
|
80
|
+
const editSessionId = ( (URI.parse(handle.$treeItemHandle))).path.substring(1);
|
|
85
81
|
const commandService = accessor.get(ICommandService);
|
|
86
82
|
await commandService.executeCommand('workbench.editSessions.actions.resumeLatest', editSessionId, true);
|
|
87
83
|
await treeView.refresh();
|
|
@@ -91,11 +87,7 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
91
87
|
constructor() {
|
|
92
88
|
super({
|
|
93
89
|
id: 'workbench.editSessions.actions.store',
|
|
94
|
-
title: ( localizeWithPath(
|
|
95
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
96
|
-
'workbench.editSessions.actions.store.v2',
|
|
97
|
-
"Store Working Changes"
|
|
98
|
-
)),
|
|
90
|
+
title: ( localizeWithPath(_moduleId, 3, "Store Working Changes")),
|
|
99
91
|
icon: Codicon.cloudUpload,
|
|
100
92
|
});
|
|
101
93
|
}
|
|
@@ -109,35 +101,30 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
109
101
|
constructor() {
|
|
110
102
|
super({
|
|
111
103
|
id: 'workbench.editSessions.actions.delete',
|
|
112
|
-
title: ( localizeWithPath(
|
|
113
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
114
|
-
'workbench.editSessions.actions.delete.v2',
|
|
115
|
-
"Delete Working Changes"
|
|
116
|
-
)),
|
|
104
|
+
title: ( localizeWithPath(_moduleId, 4, "Delete Working Changes")),
|
|
117
105
|
icon: Codicon.trash,
|
|
118
106
|
menu: {
|
|
119
107
|
id: MenuId.ViewItemContext,
|
|
120
|
-
when: ( ContextKeyExpr.and(
|
|
108
|
+
when: ( (ContextKeyExpr.and(
|
|
109
|
+
(ContextKeyExpr.equals('view', viewId)),
|
|
110
|
+
(ContextKeyExpr.regex('viewItem', /edit-session/i))
|
|
111
|
+
))),
|
|
121
112
|
group: 'inline'
|
|
122
113
|
}
|
|
123
114
|
});
|
|
124
115
|
}
|
|
125
116
|
async run(accessor, handle) {
|
|
126
|
-
const editSessionId = ( URI.parse(handle.$treeItemHandle)).path.substring(1);
|
|
117
|
+
const editSessionId = ( (URI.parse(handle.$treeItemHandle))).path.substring(1);
|
|
127
118
|
const dialogService = accessor.get(IDialogService);
|
|
128
119
|
const editSessionStorageService = accessor.get(IEditSessionsStorageService);
|
|
129
120
|
const result = await dialogService.confirm({
|
|
130
121
|
message: ( localizeWithPath(
|
|
131
|
-
|
|
132
|
-
|
|
122
|
+
_moduleId,
|
|
123
|
+
5,
|
|
133
124
|
'Are you sure you want to permanently delete your working changes with ref {0}?',
|
|
134
125
|
editSessionId
|
|
135
126
|
)),
|
|
136
|
-
detail: ( localizeWithPath(
|
|
137
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
138
|
-
'confirm delete detail.v2',
|
|
139
|
-
' You cannot undo this action.'
|
|
140
|
-
)),
|
|
127
|
+
detail: ( localizeWithPath(_moduleId, 6, ' You cannot undo this action.')),
|
|
141
128
|
type: 'warning',
|
|
142
129
|
title: EDIT_SESSIONS_TITLE.value
|
|
143
130
|
});
|
|
@@ -151,15 +138,14 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
151
138
|
constructor() {
|
|
152
139
|
super({
|
|
153
140
|
id: 'workbench.editSessions.actions.deleteAll',
|
|
154
|
-
title: ( localizeWithPath(
|
|
155
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
156
|
-
'workbench.editSessions.actions.deleteAll',
|
|
157
|
-
"Delete All Working Changes from Cloud"
|
|
158
|
-
)),
|
|
141
|
+
title: ( localizeWithPath(_moduleId, 7, "Delete All Working Changes from Cloud")),
|
|
159
142
|
icon: Codicon.trash,
|
|
160
143
|
menu: {
|
|
161
144
|
id: MenuId.ViewTitle,
|
|
162
|
-
when: ( ContextKeyExpr.and(
|
|
145
|
+
when: ( (ContextKeyExpr.and(
|
|
146
|
+
(ContextKeyExpr.equals('view', viewId)),
|
|
147
|
+
ContextKeyExpr.greater(EDIT_SESSIONS_COUNT_KEY, 0)
|
|
148
|
+
))),
|
|
163
149
|
}
|
|
164
150
|
});
|
|
165
151
|
}
|
|
@@ -168,15 +154,11 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
168
154
|
const editSessionStorageService = accessor.get(IEditSessionsStorageService);
|
|
169
155
|
const result = await dialogService.confirm({
|
|
170
156
|
message: ( localizeWithPath(
|
|
171
|
-
|
|
172
|
-
|
|
157
|
+
_moduleId,
|
|
158
|
+
8,
|
|
173
159
|
'Are you sure you want to permanently delete all stored changes from the cloud?'
|
|
174
160
|
)),
|
|
175
|
-
detail: ( localizeWithPath(
|
|
176
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
177
|
-
'confirm delete all detail',
|
|
178
|
-
' You cannot undo this action.'
|
|
179
|
-
)),
|
|
161
|
+
detail: ( localizeWithPath(_moduleId, 9, ' You cannot undo this action.')),
|
|
180
162
|
type: 'warning',
|
|
181
163
|
title: EDIT_SESSIONS_TITLE.value
|
|
182
164
|
});
|
|
@@ -188,9 +170,9 @@ let EditSessionsDataViews = class EditSessionsDataViews extends Disposable {
|
|
|
188
170
|
}));
|
|
189
171
|
}
|
|
190
172
|
};
|
|
191
|
-
EditSessionsDataViews = ( __decorate([
|
|
192
|
-
( __param(1, IInstantiationService))
|
|
193
|
-
], EditSessionsDataViews));
|
|
173
|
+
EditSessionsDataViews = ( (__decorate([
|
|
174
|
+
( (__param(1, IInstantiationService)))
|
|
175
|
+
], EditSessionsDataViews)));
|
|
194
176
|
let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
195
177
|
constructor(editSessionsStorageService, contextKeyService, workspaceContextService, fileService) {
|
|
196
178
|
this.editSessionsStorageService = editSessionsStorageService;
|
|
@@ -203,7 +185,7 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
|
203
185
|
if (!element) {
|
|
204
186
|
return this.getAllEditSessions();
|
|
205
187
|
}
|
|
206
|
-
const [ref, folderName, filePath] = ( URI.parse(element.handle)).path.substring(1).split('/');
|
|
188
|
+
const [ref, folderName, filePath] = ( (URI.parse(element.handle))).path.substring(1).split('/');
|
|
207
189
|
if (ref && !folderName) {
|
|
208
190
|
return this.getEditSession(ref);
|
|
209
191
|
}
|
|
@@ -217,20 +199,20 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
|
217
199
|
this.editSessionsCount.set(allEditSessions.length);
|
|
218
200
|
const editSessions = [];
|
|
219
201
|
for (const session of allEditSessions) {
|
|
220
|
-
const resource = ( URI.from(
|
|
202
|
+
const resource = ( (URI.from(
|
|
221
203
|
{ scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${session.ref}` }
|
|
222
|
-
));
|
|
204
|
+
)));
|
|
223
205
|
const sessionData = await this.editSessionsStorageService.read('editSessions', session.ref);
|
|
224
206
|
if (!sessionData) {
|
|
225
207
|
continue;
|
|
226
208
|
}
|
|
227
209
|
const content = JSON.parse(sessionData.content);
|
|
228
|
-
const label = ( content.folders.map((folder) => folder.name)).join(', ') ?? session.ref;
|
|
210
|
+
const label = ( (content.folders.map((folder) => folder.name))).join(', ') ?? session.ref;
|
|
229
211
|
const machineId = content.machine;
|
|
230
212
|
const machineName = machineId ? await this.editSessionsStorageService.getMachineById(machineId) : undefined;
|
|
231
213
|
const description = machineName === undefined ? fromNow(session.created, true) : `${fromNow(session.created, true)}\u00a0\u00a0\u2022\u00a0\u00a0${machineName}`;
|
|
232
214
|
editSessions.push({
|
|
233
|
-
handle: ( resource.toString()),
|
|
215
|
+
handle: ( (resource.toString())),
|
|
234
216
|
collapsibleState: TreeItemCollapsibleState.Collapsed,
|
|
235
217
|
label: { label },
|
|
236
218
|
description: description,
|
|
@@ -250,17 +232,19 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
|
250
232
|
const folder = content.folders[0];
|
|
251
233
|
return this.getEditSessionFolderContents(ref, folder.name);
|
|
252
234
|
}
|
|
253
|
-
return (
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
235
|
+
return (
|
|
236
|
+
(content.folders.map((folder) => {
|
|
237
|
+
const resource = ( (URI.from(
|
|
238
|
+
{ scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${data.ref}/${folder.name}` }
|
|
239
|
+
)));
|
|
240
|
+
return {
|
|
241
|
+
handle: ( (resource.toString())),
|
|
242
|
+
collapsibleState: TreeItemCollapsibleState.Collapsed,
|
|
243
|
+
label: { label: folder.name },
|
|
244
|
+
themeIcon: Codicon.folder
|
|
245
|
+
};
|
|
246
|
+
}))
|
|
247
|
+
);
|
|
264
248
|
}
|
|
265
249
|
async getEditSessionFolderContents(ref, folderName) {
|
|
266
250
|
const data = await this.editSessionsStorageService.read('editSessions', ref);
|
|
@@ -273,38 +257,26 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
|
273
257
|
if (!editSessionFolder) {
|
|
274
258
|
return [];
|
|
275
259
|
}
|
|
276
|
-
return Promise.all(( editSessionFolder.workingChanges.map(async (change) => {
|
|
277
|
-
const cloudChangeUri = ( URI.from(
|
|
260
|
+
return Promise.all(( (editSessionFolder.workingChanges.map(async (change) => {
|
|
261
|
+
const cloudChangeUri = ( (URI.from(
|
|
278
262
|
{ scheme: EDIT_SESSIONS_SCHEME, authority: 'remote-session-content', path: `/${data.ref}/${folderName}/${change.relativeFilePath}` }
|
|
279
|
-
));
|
|
263
|
+
)));
|
|
280
264
|
if (currentWorkspaceFolder?.uri) {
|
|
281
265
|
const localCopy = joinPath(currentWorkspaceFolder.uri, change.relativeFilePath);
|
|
282
266
|
if (change.type === ChangeType.Addition && (await this.fileService.exists(localCopy))) {
|
|
283
267
|
return {
|
|
284
|
-
handle: ( cloudChangeUri.toString()),
|
|
268
|
+
handle: ( (cloudChangeUri.toString())),
|
|
285
269
|
resourceUri: cloudChangeUri,
|
|
286
270
|
collapsibleState: TreeItemCollapsibleState.None,
|
|
287
271
|
label: { label: change.relativeFilePath },
|
|
288
272
|
themeIcon: Codicon.file,
|
|
289
273
|
command: {
|
|
290
274
|
id: 'vscode.diff',
|
|
291
|
-
title: ( localizeWithPath(
|
|
292
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
293
|
-
'compare changes',
|
|
294
|
-
'Compare Changes'
|
|
295
|
-
)),
|
|
275
|
+
title: ( localizeWithPath(_moduleId, 10, 'Compare Changes')),
|
|
296
276
|
arguments: [
|
|
297
277
|
localCopy,
|
|
298
278
|
cloudChangeUri,
|
|
299
|
-
`${basename(change.relativeFilePath)} (${( localizeWithPath(
|
|
300
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
301
|
-
'local copy',
|
|
302
|
-
'Local Copy'
|
|
303
|
-
))} \u2194 ${( localizeWithPath(
|
|
304
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
305
|
-
'cloud changes',
|
|
306
|
-
'Cloud Changes'
|
|
307
|
-
))})`,
|
|
279
|
+
`${basename(change.relativeFilePath)} (${( localizeWithPath(_moduleId, 11, 'Local Copy'))} \u2194 ${( localizeWithPath(_moduleId, 12, 'Cloud Changes'))})`,
|
|
308
280
|
undefined
|
|
309
281
|
]
|
|
310
282
|
}
|
|
@@ -312,29 +284,25 @@ let EditSessionDataViewDataProvider = class EditSessionDataViewDataProvider {
|
|
|
312
284
|
}
|
|
313
285
|
}
|
|
314
286
|
return {
|
|
315
|
-
handle: ( cloudChangeUri.toString()),
|
|
287
|
+
handle: ( (cloudChangeUri.toString())),
|
|
316
288
|
resourceUri: cloudChangeUri,
|
|
317
289
|
collapsibleState: TreeItemCollapsibleState.None,
|
|
318
290
|
label: { label: change.relativeFilePath },
|
|
319
291
|
themeIcon: Codicon.file,
|
|
320
292
|
command: {
|
|
321
293
|
id: API_OPEN_EDITOR_COMMAND_ID,
|
|
322
|
-
title: ( localizeWithPath(
|
|
323
|
-
'vs/workbench/contrib/editSessions/browser/editSessionsViews',
|
|
324
|
-
'open file',
|
|
325
|
-
'Open File'
|
|
326
|
-
)),
|
|
294
|
+
title: ( localizeWithPath(_moduleId, 13, 'Open File')),
|
|
327
295
|
arguments: [cloudChangeUri, undefined, undefined]
|
|
328
296
|
}
|
|
329
297
|
};
|
|
330
|
-
})));
|
|
298
|
+
}))));
|
|
331
299
|
}
|
|
332
300
|
};
|
|
333
|
-
EditSessionDataViewDataProvider = ( __decorate([
|
|
334
|
-
( __param(0, IEditSessionsStorageService)),
|
|
335
|
-
( __param(1, IContextKeyService)),
|
|
336
|
-
( __param(2, IWorkspaceContextService)),
|
|
337
|
-
( __param(3, IFileService))
|
|
338
|
-
], EditSessionDataViewDataProvider));
|
|
301
|
+
EditSessionDataViewDataProvider = ( (__decorate([
|
|
302
|
+
( (__param(0, IEditSessionsStorageService))),
|
|
303
|
+
( (__param(1, IContextKeyService))),
|
|
304
|
+
( (__param(2, IWorkspaceContextService))),
|
|
305
|
+
( (__param(3, IFileService)))
|
|
306
|
+
], EditSessionDataViewDataProvider)));
|
|
339
307
|
|
|
340
308
|
export { EditSessionsDataViews };
|
|
@@ -5,38 +5,27 @@ import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/conte
|
|
|
5
5
|
import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
|
|
6
6
|
import { StringSHA1 } from 'vscode/vscode/vs/base/common/hash';
|
|
7
7
|
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
'cloud changes',
|
|
11
|
-
'Cloud Changes'
|
|
12
|
-
));
|
|
8
|
+
const _moduleId = "vs/workbench/contrib/editSessions/common/editSessions";
|
|
9
|
+
const EDIT_SESSION_SYNC_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Cloud Changes'));
|
|
13
10
|
var ChangeType;
|
|
14
|
-
( (function(ChangeType) {
|
|
11
|
+
( ((function(ChangeType) {
|
|
15
12
|
ChangeType[ChangeType["Addition"] = 1] = "Addition";
|
|
16
13
|
ChangeType[ChangeType["Deletion"] = 2] = "Deletion";
|
|
17
|
-
})(ChangeType || (ChangeType = {})));
|
|
14
|
+
})(ChangeType || (ChangeType = {}))));
|
|
18
15
|
var FileType;
|
|
19
|
-
( (function(FileType) {
|
|
16
|
+
( ((function(FileType) {
|
|
20
17
|
FileType[FileType["File"] = 1] = "File";
|
|
21
|
-
})(FileType || (FileType = {})));
|
|
18
|
+
})(FileType || (FileType = {}))));
|
|
22
19
|
const EditSessionSchemaVersion = 3;
|
|
23
20
|
const EDIT_SESSIONS_SIGNED_IN_KEY = 'editSessionsSignedIn';
|
|
24
|
-
const EDIT_SESSIONS_SIGNED_IN = ( new RawContextKey(EDIT_SESSIONS_SIGNED_IN_KEY, false));
|
|
21
|
+
const EDIT_SESSIONS_SIGNED_IN = ( (new RawContextKey(EDIT_SESSIONS_SIGNED_IN_KEY, false)));
|
|
25
22
|
const EDIT_SESSIONS_PENDING_KEY = 'editSessionsPending';
|
|
26
|
-
const EDIT_SESSIONS_PENDING = ( new RawContextKey(EDIT_SESSIONS_PENDING_KEY, false));
|
|
23
|
+
const EDIT_SESSIONS_PENDING = ( (new RawContextKey(EDIT_SESSIONS_PENDING_KEY, false)));
|
|
27
24
|
const EDIT_SESSIONS_CONTAINER_ID = 'workbench.view.editSessions';
|
|
28
25
|
const EDIT_SESSIONS_DATA_VIEW_ID = 'workbench.views.editSessions.data';
|
|
29
|
-
const EDIT_SESSIONS_TITLE = ( localize2WithPath(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
'Cloud Changes'
|
|
33
|
-
));
|
|
34
|
-
const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localizeWithPath(
|
|
35
|
-
'vs/workbench/contrib/editSessions/common/editSessions',
|
|
36
|
-
'editSessionViewIcon',
|
|
37
|
-
'View icon of the cloud changes view.'
|
|
38
|
-
)));
|
|
39
|
-
const EDIT_SESSIONS_SHOW_VIEW = ( new RawContextKey('editSessionsShowView', false));
|
|
26
|
+
const EDIT_SESSIONS_TITLE = ( localize2WithPath(_moduleId, 0, 'Cloud Changes'));
|
|
27
|
+
const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, ( localizeWithPath(_moduleId, 1, 'View icon of the cloud changes view.')));
|
|
28
|
+
const EDIT_SESSIONS_SHOW_VIEW = ( (new RawContextKey('editSessionsShowView', false)));
|
|
40
29
|
const EDIT_SESSIONS_SCHEME = 'vscode-edit-sessions';
|
|
41
30
|
function decodeEditSessionFileContent(version, content) {
|
|
42
31
|
switch (version) {
|
|
@@ -45,11 +34,11 @@ function decodeEditSessionFileContent(version, content) {
|
|
|
45
34
|
case 2:
|
|
46
35
|
return decodeBase64(content);
|
|
47
36
|
default:
|
|
48
|
-
throw new Error('Upgrade to a newer version to decode this content.');
|
|
37
|
+
throw ( (new Error('Upgrade to a newer version to decode this content.')));
|
|
49
38
|
}
|
|
50
39
|
}
|
|
51
40
|
function hashedEditSessionId(editSessionId) {
|
|
52
|
-
const sha1 = ( new StringSHA1());
|
|
41
|
+
const sha1 = ( (new StringSHA1()));
|
|
53
42
|
sha1.update(editSessionId);
|
|
54
43
|
return sha1.digest();
|
|
55
44
|
}
|
|
@@ -6,14 +6,11 @@ import { AbstractLogger } from 'vscode/vscode/vs/platform/log/common/log';
|
|
|
6
6
|
import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
7
7
|
import { editSessionsLogId } from './editSessions.js';
|
|
8
8
|
|
|
9
|
+
const _moduleId = "vs/workbench/contrib/editSessions/common/editSessionsLogService";
|
|
9
10
|
let EditSessionsLogService = class EditSessionsLogService extends AbstractLogger {
|
|
10
11
|
constructor(loggerService, environmentService) {
|
|
11
12
|
super();
|
|
12
|
-
this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localizeWithPath(
|
|
13
|
-
'vs/workbench/contrib/editSessions/common/editSessionsLogService',
|
|
14
|
-
'cloudChangesLog',
|
|
15
|
-
"Cloud Changes"
|
|
16
|
-
)) }));
|
|
13
|
+
this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${editSessionsLogId}.log`), { id: editSessionsLogId, name: ( localizeWithPath(_moduleId, 0, "Cloud Changes")) }));
|
|
17
14
|
}
|
|
18
15
|
trace(message, ...args) {
|
|
19
16
|
this.logger.trace(message, ...args);
|
|
@@ -34,9 +31,9 @@ let EditSessionsLogService = class EditSessionsLogService extends AbstractLogger
|
|
|
34
31
|
this.logger.flush();
|
|
35
32
|
}
|
|
36
33
|
};
|
|
37
|
-
EditSessionsLogService = ( __decorate([
|
|
38
|
-
( __param(0, ILoggerService)),
|
|
39
|
-
( __param(1, IEnvironmentService))
|
|
40
|
-
], EditSessionsLogService));
|
|
34
|
+
EditSessionsLogService = ( (__decorate([
|
|
35
|
+
( (__param(0, ILoggerService))),
|
|
36
|
+
( (__param(1, IEnvironmentService)))
|
|
37
|
+
], EditSessionsLogService)));
|
|
41
38
|
|
|
42
39
|
export { EditSessionsLogService };
|
|
@@ -107,16 +107,16 @@ let WorkspaceStateSynchroniser = class WorkspaceStateSynchroniser extends Abstra
|
|
|
107
107
|
return null;
|
|
108
108
|
}
|
|
109
109
|
applyResult(remoteUserData, lastSyncUserData, result, force) {
|
|
110
|
-
throw new Error('Method not implemented.');
|
|
110
|
+
throw ( new Error('Method not implemented.'));
|
|
111
111
|
}
|
|
112
112
|
async generateSyncPreview(remoteUserData, lastSyncUserData, isRemoteDataFromCurrentMachine, userDataSyncConfiguration, token) {
|
|
113
113
|
return [];
|
|
114
114
|
}
|
|
115
115
|
getMergeResult(resourcePreview, token) {
|
|
116
|
-
throw new Error('Method not implemented.');
|
|
116
|
+
throw ( new Error('Method not implemented.'));
|
|
117
117
|
}
|
|
118
118
|
getAcceptResult(resourcePreview, resource, content, token) {
|
|
119
|
-
throw new Error('Method not implemented.');
|
|
119
|
+
throw ( new Error('Method not implemented.'));
|
|
120
120
|
}
|
|
121
121
|
async hasRemoteChanged(lastSyncUserData) {
|
|
122
122
|
return true;
|
|
@@ -14,7 +14,7 @@ let EditSessionIdentityService = class EditSessionIdentityService {
|
|
|
14
14
|
}
|
|
15
15
|
registerEditSessionIdentityProvider(provider) {
|
|
16
16
|
if (this._editSessionIdentifierProviders.get(provider.scheme)) {
|
|
17
|
-
throw new Error(`A provider has already been registered for scheme ${provider.scheme}`);
|
|
17
|
+
throw ( new Error(`A provider has already been registered for scheme ${provider.scheme}`));
|
|
18
18
|
}
|
|
19
19
|
this._editSessionIdentifierProviders.set(provider.scheme, provider);
|
|
20
20
|
return toDisposable(() => {
|