@theia/core 1.58.3 → 1.59.0-next.72
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/README.md +6 -6
- package/i18n/nls.json +1 -1
- package/lib/browser/catalog.json +26 -7
- package/lib/browser/logger-frontend-module.d.ts.map +1 -1
- package/lib/browser/logger-frontend-module.js +2 -3
- package/lib/browser/logger-frontend-module.js.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.d.ts +7 -0
- package/lib/browser/menu/browser-menu-plugin.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.js +46 -3
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/browser/navigatable-types.d.ts.map +1 -1
- package/lib/browser/navigatable-types.js +1 -1
- package/lib/browser/navigatable-types.js.map +1 -1
- package/lib/browser/saveable-service.js +1 -1
- package/lib/browser/saveable-service.js.map +1 -1
- package/lib/browser/saveable.d.ts +2 -0
- package/lib/browser/saveable.d.ts.map +1 -1
- package/lib/browser/saveable.js.map +1 -1
- package/lib/common/array-utils.d.ts +2 -0
- package/lib/common/array-utils.d.ts.map +1 -1
- package/lib/common/array-utils.js +24 -0
- package/lib/common/array-utils.js.map +1 -1
- package/lib/common/content-replacer.d.ts +56 -0
- package/lib/common/content-replacer.d.ts.map +1 -0
- package/lib/common/content-replacer.js +139 -0
- package/lib/common/content-replacer.js.map +1 -0
- package/lib/common/content-replacer.spec.d.ts +2 -0
- package/lib/common/content-replacer.spec.d.ts.map +1 -0
- package/lib/common/content-replacer.spec.js +115 -0
- package/lib/common/content-replacer.spec.js.map +1 -0
- package/lib/common/logger-binding.d.ts +3 -0
- package/lib/common/logger-binding.d.ts.map +1 -0
- package/lib/common/logger-binding.js +36 -0
- package/lib/common/logger-binding.js.map +1 -0
- package/lib/common/logger-protocol.d.ts +1 -1
- package/lib/common/logger-protocol.d.ts.map +1 -1
- package/lib/common/logger-protocol.js +3 -1
- package/lib/common/logger-protocol.js.map +1 -1
- package/lib/common/logger.d.ts +1 -0
- package/lib/common/logger.d.ts.map +1 -1
- package/lib/common/logger.js +12 -1
- package/lib/common/logger.js.map +1 -1
- package/lib/common/menu/composite-menu-node.d.ts +2 -2
- package/lib/common/menu/composite-menu-node.d.ts.map +1 -1
- package/lib/common/menu/composite-menu-node.js +2 -0
- package/lib/common/menu/composite-menu-node.js.map +1 -1
- package/lib/common/menu/menu-model-registry.d.ts +22 -4
- package/lib/common/menu/menu-model-registry.d.ts.map +1 -1
- package/lib/common/menu/menu-model-registry.js +74 -17
- package/lib/common/menu/menu-model-registry.js.map +1 -1
- package/lib/common/menu/menu-types.d.ts +2 -1
- package/lib/common/menu/menu-types.d.ts.map +1 -1
- package/lib/common/menu/menu-types.js.map +1 -1
- package/lib/common/resource.d.ts +11 -2
- package/lib/common/resource.d.ts.map +1 -1
- package/lib/common/resource.js +11 -1
- package/lib/common/resource.js.map +1 -1
- package/lib/node/console-logger-server.d.ts +5 -1
- package/lib/node/console-logger-server.d.ts.map +1 -1
- package/lib/node/console-logger-server.js +18 -4
- package/lib/node/console-logger-server.js.map +1 -1
- package/lib/node/logger-backend-module.d.ts.map +1 -1
- package/lib/node/logger-backend-module.js +2 -3
- package/lib/node/logger-backend-module.js.map +1 -1
- package/lib/node/logger-cli-contribution.d.ts +2 -0
- package/lib/node/logger-cli-contribution.d.ts.map +1 -1
- package/lib/node/logger-cli-contribution.js +40 -7
- package/lib/node/logger-cli-contribution.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/logger-frontend-module.ts +3 -4
- package/src/browser/menu/browser-menu-plugin.ts +55 -5
- package/src/browser/navigatable-types.ts +1 -1
- package/src/browser/saveable-service.ts +1 -1
- package/src/browser/saveable.ts +2 -0
- package/src/common/array-utils.ts +25 -0
- package/src/common/content-replacer.spec.ts +124 -0
- package/src/common/content-replacer.ts +151 -0
- package/src/common/logger-binding.ts +34 -0
- package/src/common/logger-protocol.ts +4 -2
- package/src/common/logger.ts +10 -1
- package/src/common/menu/composite-menu-node.ts +4 -2
- package/src/common/menu/menu-model-registry.ts +84 -19
- package/src/common/menu/menu-types.ts +2 -1
- package/src/common/resource.ts +17 -4
- package/src/node/console-logger-server.ts +22 -2
- package/src/node/logger-backend-module.ts +3 -4
- package/src/node/logger-cli-contribution.ts +43 -7
|
@@ -38,6 +38,23 @@ export interface MenuContribution {
|
|
|
38
38
|
*/
|
|
39
39
|
registerMenus(menus: MenuModelRegistry): void;
|
|
40
40
|
}
|
|
41
|
+
export declare enum ChangeKind {
|
|
42
|
+
ADDED = 0,
|
|
43
|
+
REMOVED = 1,
|
|
44
|
+
CHANGED = 2,
|
|
45
|
+
LINKED = 3
|
|
46
|
+
}
|
|
47
|
+
export interface MenuChangedEvent {
|
|
48
|
+
kind: ChangeKind;
|
|
49
|
+
path: MenuPath;
|
|
50
|
+
}
|
|
51
|
+
export interface StructuralMenuChange extends MenuChangedEvent {
|
|
52
|
+
kind: ChangeKind.ADDED | ChangeKind.REMOVED | ChangeKind.LINKED;
|
|
53
|
+
affectedChildId: string;
|
|
54
|
+
}
|
|
55
|
+
export declare namespace StructuralMenuChange {
|
|
56
|
+
function is(evt: MenuChangedEvent): evt is StructuralMenuChange;
|
|
57
|
+
}
|
|
41
58
|
/**
|
|
42
59
|
* The MenuModelRegistry allows to register and unregister menus, submenus and actions
|
|
43
60
|
* via strings and {@link MenuAction}s without the need to access the underlying UI
|
|
@@ -48,8 +65,8 @@ export declare class MenuModelRegistry {
|
|
|
48
65
|
protected readonly commands: CommandRegistry;
|
|
49
66
|
protected readonly root: CompositeMenuNode;
|
|
50
67
|
protected readonly independentSubmenus: Map<string, MutableCompoundMenuNode>;
|
|
51
|
-
protected readonly onDidChangeEmitter: Emitter<
|
|
52
|
-
get onDidChange(): Event<
|
|
68
|
+
protected readonly onDidChangeEmitter: Emitter<MenuChangedEvent>;
|
|
69
|
+
get onDidChange(): Event<MenuChangedEvent>;
|
|
53
70
|
protected isReady: boolean;
|
|
54
71
|
constructor(contributions: ContributionProvider<MenuContribution>, commands: CommandRegistry);
|
|
55
72
|
onStart(): void;
|
|
@@ -65,6 +82,7 @@ export declare class MenuModelRegistry {
|
|
|
65
82
|
* @returns a disposable which, when called, will remove the menu node again.
|
|
66
83
|
*/
|
|
67
84
|
registerMenuNode(menuPath: MenuPath | string, menuNode: MenuNode, group?: string): Disposable;
|
|
85
|
+
protected getParentPath(menuPath: MenuPath | string, group?: string): string[];
|
|
68
86
|
getMenuNode(menuPath: MenuPath | string, group?: string): MutableCompoundMenuNode;
|
|
69
87
|
/**
|
|
70
88
|
* Register a new menu at the given path with the given label.
|
|
@@ -141,8 +159,8 @@ export declare class MenuModelRegistry {
|
|
|
141
159
|
removeSingleRootNode(fullMenuModel: MutableCompoundMenuNode, menuPath: MenuPath): CompoundMenuNode;
|
|
142
160
|
protected allChildrenCompound(children: ReadonlyArray<MenuNode>): boolean;
|
|
143
161
|
protected isEmpty(children: ReadonlyArray<MenuNode>): boolean;
|
|
144
|
-
protected changeEventOnDispose(disposable: Disposable): Disposable;
|
|
145
|
-
protected fireChangeEvent(): void;
|
|
162
|
+
protected changeEventOnDispose(path: MenuPath, id: string, disposable: Disposable): Disposable;
|
|
163
|
+
protected fireChangeEvent<T extends MenuChangedEvent>(evt: T): void;
|
|
146
164
|
/**
|
|
147
165
|
* Returns the {@link MenuPath path} at which a given menu node can be accessed from this registry, if it can be determined.
|
|
148
166
|
* Returns `undefined` if the `parent` of any node in the chain is unknown.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-model-registry.d.ts","sourceRoot":"","sources":["../../../src/common/menu/menu-model-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAA4B,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAAQ,EAAoB,QAAQ,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3I,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAAC;CACjD;AAED;;;;GAIG;AACH,qBACa,iBAAiB;IActB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe;IAdzE,SAAS,CAAC,QAAQ,CAAC,IAAI,oBAA6B;IACpD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,uCAA8C;IAEpF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"menu-model-registry.d.ts","sourceRoot":"","sources":["../../../src/common/menu/menu-model-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.MenuModelRegistry = exports.MenuContribution = void 0;
|
|
18
|
+
exports.MenuModelRegistry = exports.StructuralMenuChange = exports.ChangeKind = exports.MenuContribution = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("inversify");
|
|
21
21
|
const command_1 = require("../command");
|
|
@@ -26,6 +26,20 @@ const action_menu_node_1 = require("./action-menu-node");
|
|
|
26
26
|
const composite_menu_node_1 = require("./composite-menu-node");
|
|
27
27
|
const menu_types_1 = require("./menu-types");
|
|
28
28
|
exports.MenuContribution = Symbol('MenuContribution');
|
|
29
|
+
var ChangeKind;
|
|
30
|
+
(function (ChangeKind) {
|
|
31
|
+
ChangeKind[ChangeKind["ADDED"] = 0] = "ADDED";
|
|
32
|
+
ChangeKind[ChangeKind["REMOVED"] = 1] = "REMOVED";
|
|
33
|
+
ChangeKind[ChangeKind["CHANGED"] = 2] = "CHANGED";
|
|
34
|
+
ChangeKind[ChangeKind["LINKED"] = 3] = "LINKED";
|
|
35
|
+
})(ChangeKind || (exports.ChangeKind = ChangeKind = {}));
|
|
36
|
+
var StructuralMenuChange;
|
|
37
|
+
(function (StructuralMenuChange) {
|
|
38
|
+
function is(evt) {
|
|
39
|
+
return evt.kind !== ChangeKind.CHANGED;
|
|
40
|
+
}
|
|
41
|
+
StructuralMenuChange.is = is;
|
|
42
|
+
})(StructuralMenuChange || (exports.StructuralMenuChange = StructuralMenuChange = {}));
|
|
29
43
|
/**
|
|
30
44
|
* The MenuModelRegistry allows to register and unregister menus, submenus and actions
|
|
31
45
|
* via strings and {@link MenuAction}s without the need to access the underlying UI
|
|
@@ -66,8 +80,21 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
66
80
|
registerMenuNode(menuPath, menuNode, group) {
|
|
67
81
|
const parent = this.getMenuNode(menuPath, group);
|
|
68
82
|
const disposable = parent.addNode(menuNode);
|
|
69
|
-
this.
|
|
70
|
-
|
|
83
|
+
const parentPath = this.getParentPath(menuPath, group);
|
|
84
|
+
this.fireChangeEvent({
|
|
85
|
+
kind: ChangeKind.ADDED,
|
|
86
|
+
path: parentPath,
|
|
87
|
+
affectedChildId: menuNode.id
|
|
88
|
+
});
|
|
89
|
+
return this.changeEventOnDispose(parentPath, menuNode.id, disposable);
|
|
90
|
+
}
|
|
91
|
+
getParentPath(menuPath, group) {
|
|
92
|
+
if (typeof menuPath === 'string') {
|
|
93
|
+
return group ? [menuPath, group] : [menuPath];
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
return group ? menuPath.concat(group) : menuPath;
|
|
97
|
+
}
|
|
71
98
|
}
|
|
72
99
|
getMenuNode(menuPath, group) {
|
|
73
100
|
if (typeof menuPath === 'string') {
|
|
@@ -111,12 +138,20 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
111
138
|
let disposable = disposable_1.Disposable.NULL;
|
|
112
139
|
if (!groupNode) {
|
|
113
140
|
groupNode = new composite_menu_node_1.CompositeMenuNode(menuId, label, options, parent);
|
|
114
|
-
disposable = this.changeEventOnDispose(parent.addNode(groupNode));
|
|
141
|
+
disposable = this.changeEventOnDispose(groupPath, menuId, parent.addNode(groupNode));
|
|
142
|
+
this.fireChangeEvent({
|
|
143
|
+
kind: ChangeKind.ADDED,
|
|
144
|
+
path: groupPath,
|
|
145
|
+
affectedChildId: menuId
|
|
146
|
+
});
|
|
115
147
|
}
|
|
116
148
|
else {
|
|
149
|
+
this.fireChangeEvent({
|
|
150
|
+
kind: ChangeKind.CHANGED,
|
|
151
|
+
path: groupPath,
|
|
152
|
+
});
|
|
117
153
|
groupNode.updateOptions({ ...options, label });
|
|
118
154
|
}
|
|
119
|
-
this.fireChangeEvent();
|
|
120
155
|
return disposable;
|
|
121
156
|
}
|
|
122
157
|
registerIndependentSubmenu(id, label, options) {
|
|
@@ -124,11 +159,12 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
124
159
|
console.debug(`Independent submenu with path ${id} registered, but given ID already exists.`);
|
|
125
160
|
}
|
|
126
161
|
this.independentSubmenus.set(id, new composite_menu_node_1.CompositeMenuNode(id, label, options));
|
|
127
|
-
return this.changeEventOnDispose(disposable_1.Disposable.create(() => this.independentSubmenus.delete(id)));
|
|
162
|
+
return this.changeEventOnDispose([], id, disposable_1.Disposable.create(() => this.independentSubmenus.delete(id)));
|
|
128
163
|
}
|
|
129
164
|
linkSubmenu(parentPath, childId, options, group) {
|
|
130
165
|
const child = this.getMenuNode(childId);
|
|
131
166
|
const parent = this.getMenuNode(parentPath, group);
|
|
167
|
+
const affectedPath = this.getParentPath(parentPath, group);
|
|
132
168
|
const isRecursive = (node, childNode) => {
|
|
133
169
|
if (node.id === childNode.id) {
|
|
134
170
|
return true;
|
|
@@ -145,8 +181,12 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
145
181
|
}
|
|
146
182
|
const wrapper = new composite_menu_node_1.CompositeMenuNodeWrapper(child, parent, options);
|
|
147
183
|
const disposable = parent.addNode(wrapper);
|
|
148
|
-
this.fireChangeEvent(
|
|
149
|
-
|
|
184
|
+
this.fireChangeEvent({
|
|
185
|
+
kind: ChangeKind.LINKED,
|
|
186
|
+
path: affectedPath,
|
|
187
|
+
affectedChildId: child.id
|
|
188
|
+
});
|
|
189
|
+
return this.changeEventOnDispose(affectedPath, child.id, disposable);
|
|
150
190
|
}
|
|
151
191
|
unregisterMenuAction(itemOrCommandOrId, menuPath) {
|
|
152
192
|
const id = menu_types_1.MenuAction.is(itemOrCommandOrId) ? itemOrCommandOrId.commandId
|
|
@@ -155,10 +195,15 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
155
195
|
if (menuPath) {
|
|
156
196
|
const parent = this.findGroup(menuPath);
|
|
157
197
|
parent.removeNode(id);
|
|
158
|
-
this.fireChangeEvent(
|
|
159
|
-
|
|
198
|
+
this.fireChangeEvent({
|
|
199
|
+
kind: ChangeKind.REMOVED,
|
|
200
|
+
path: menuPath,
|
|
201
|
+
affectedChildId: id
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
this.unregisterMenuNode(id);
|
|
160
206
|
}
|
|
161
|
-
this.unregisterMenuNode(id);
|
|
162
207
|
}
|
|
163
208
|
/**
|
|
164
209
|
* Recurse all menus, removing any menus matching the `id`.
|
|
@@ -166,16 +211,24 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
166
211
|
* @param id technical identifier of the `MenuNode`.
|
|
167
212
|
*/
|
|
168
213
|
unregisterMenuNode(id) {
|
|
214
|
+
const parentPath = [];
|
|
169
215
|
const recurse = (root) => {
|
|
170
216
|
root.children.forEach(node => {
|
|
171
217
|
if (menu_types_1.CompoundMenuNode.isMutable(node)) {
|
|
172
|
-
node.removeNode(id)
|
|
218
|
+
if (node.removeNode(id)) {
|
|
219
|
+
this.fireChangeEvent({
|
|
220
|
+
kind: ChangeKind.REMOVED,
|
|
221
|
+
path: parentPath,
|
|
222
|
+
affectedChildId: id
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
parentPath.push(node.id);
|
|
173
226
|
recurse(node);
|
|
227
|
+
parentPath.pop();
|
|
174
228
|
}
|
|
175
229
|
});
|
|
176
230
|
};
|
|
177
231
|
recurse(this.root);
|
|
178
|
-
this.fireChangeEvent();
|
|
179
232
|
}
|
|
180
233
|
/**
|
|
181
234
|
* Finds a submenu as a descendant of the `root` node.
|
|
@@ -261,15 +314,19 @@ let MenuModelRegistry = class MenuModelRegistry {
|
|
|
261
314
|
}
|
|
262
315
|
return true;
|
|
263
316
|
}
|
|
264
|
-
changeEventOnDispose(disposable) {
|
|
317
|
+
changeEventOnDispose(path, id, disposable) {
|
|
265
318
|
return disposable_1.Disposable.create(() => {
|
|
266
319
|
disposable.dispose();
|
|
267
|
-
this.fireChangeEvent(
|
|
320
|
+
this.fireChangeEvent({
|
|
321
|
+
path,
|
|
322
|
+
affectedChildId: id,
|
|
323
|
+
kind: ChangeKind.REMOVED
|
|
324
|
+
});
|
|
268
325
|
});
|
|
269
326
|
}
|
|
270
|
-
fireChangeEvent() {
|
|
327
|
+
fireChangeEvent(evt) {
|
|
271
328
|
if (this.isReady) {
|
|
272
|
-
this.onDidChangeEmitter.fire();
|
|
329
|
+
this.onDidChangeEmitter.fire(evt);
|
|
273
330
|
}
|
|
274
331
|
}
|
|
275
332
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-model-registry.js","sourceRoot":"","sources":["../../../src/common/menu/menu-model-registry.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAAsD;AACtD,wCAAsD;AACtD,oEAAgE;AAChE,8CAA2C;AAC3C,oCAA0C;AAC1C,yDAAoD;AACpD,+DAAoF;AACpF,6CAA2I;AAE9H,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAoC3D;;;;GAIG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAM1B,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IACzC,CAAC;IAID,YAEI,aAAwE,EAC/C,QAA4C;QADlD,kBAAa,GAAb,aAAa,CAAwC;QAC5B,aAAQ,GAAR,QAAQ,CAAiB;QAdtD,SAAI,GAAG,IAAI,uCAAiB,CAAC,EAAE,CAAC,CAAC;QACjC,wBAAmB,GAAG,IAAI,GAAG,EAAmC,CAAC;QAEjE,uBAAkB,GAAG,IAAI,eAAO,
|
|
1
|
+
{"version":3,"file":"menu-model-registry.js","sourceRoot":"","sources":["../../../src/common/menu/menu-model-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -109,8 +109,9 @@ export interface MutableCompoundMenuNode extends CompoundMenuNode {
|
|
|
109
109
|
* Removes the first node with the given id.
|
|
110
110
|
*
|
|
111
111
|
* @param id node id.
|
|
112
|
+
* @returns true if the id was present
|
|
112
113
|
*/
|
|
113
|
-
removeNode(id: string):
|
|
114
|
+
removeNode(id: string): boolean;
|
|
114
115
|
/**
|
|
115
116
|
* Fills any `undefined` fields with the values from the {@link options}.
|
|
116
117
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-types.d.ts","sourceRoot":"","sources":["../../../src/common/menu/menu-types.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;AAChC,eAAO,MAAM,aAAa,EAAE,QAAsB,CAAC;AACnD,eAAO,MAAM,WAAW,EAAE,QAA0B,CAAC;AACrD,eAAO,MAAM,aAAa,EAAE,QAA4B,CAAC;AACzD,eAAO,MAAM,gBAAgB,UAA2C,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,mHAAmH;AACnH,MAAM,WAAW,YAAa,SAAQ,gBAAgB,EAAE,qBAAqB;CAAI;AAEjF;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,qBAAqB,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAErF;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,yBAAiB,UAAU,CAAC;IAExB,SAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,UAAU,CAElD;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;IACzJ;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,0BAAkB,oBAAoB;IAClC,2FAA2F;IAC3F,OAAO,IAAA;IACP,+GAA+G;IAC/G,KAAK,IAAA;IACL,oHAAoH;IACpH,IAAI,IAAA;CACP;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IAClD;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC1C;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;IACpC
|
|
1
|
+
{"version":3,"file":"menu-types.d.ts","sourceRoot":"","sources":["../../../src/common/menu/menu-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-types.js","sourceRoot":"","sources":["../../../src/common/menu/menu-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,oCAAoC;AAGvB,QAAA,aAAa,GAAa,CAAC,SAAS,CAAC,CAAC;AACtC,QAAA,WAAW,GAAa,CAAC,aAAa,CAAC,CAAC;AACxC,QAAA,aAAa,GAAa,CAAC,eAAe,CAAC,CAAC;AAC5C,QAAA,gBAAgB,GAAG,CAAC,GAAG,qBAAa,EAAE,oBAAoB,CAAC,CAAC;AAgEzE,IAAiB,UAAU,CAK1B;AALD,WAAiB,UAAU;IACvB,8CAA8C;IAC9C,SAAgB,EAAE,CAAC,GAAY;QAC3B,OAAO,IAAA,gBAAQ,EAAC,GAAG,CAAC,IAAI,WAAW,IAAI,GAAG,CAAC;IAC/C,CAAC;IAFe,aAAE,KAEjB,CAAA;AACL,CAAC,EALgB,UAAU,0BAAV,UAAU,QAK1B;
|
|
1
|
+
{"version":3,"file":"menu-types.js","sourceRoot":"","sources":["../../../src/common/menu/menu-types.ts"],"names":[],"mappings":"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"}
|
package/lib/common/resource.d.ts
CHANGED
|
@@ -38,6 +38,8 @@ export interface Resource extends Disposable {
|
|
|
38
38
|
readonly onDidChangeReadOnly?: Event<boolean | MarkdownString>;
|
|
39
39
|
readonly readOnly?: boolean | MarkdownString;
|
|
40
40
|
readonly initiallyDirty?: boolean;
|
|
41
|
+
/** If false, the application should not attempt to auto-save this resource. */
|
|
42
|
+
readonly autosaveable?: boolean;
|
|
41
43
|
/**
|
|
42
44
|
* Reads latest content of this resource.
|
|
43
45
|
*
|
|
@@ -115,6 +117,11 @@ export declare namespace ResourceError {
|
|
|
115
117
|
}
|
|
116
118
|
export declare const ResourceResolver: unique symbol;
|
|
117
119
|
export interface ResourceResolver {
|
|
120
|
+
/**
|
|
121
|
+
* Resolvers will be ordered by descending priority.
|
|
122
|
+
* Default: 0
|
|
123
|
+
*/
|
|
124
|
+
priority?: number;
|
|
118
125
|
/**
|
|
119
126
|
* Reject if a resource cannot be provided.
|
|
120
127
|
*/
|
|
@@ -125,6 +132,7 @@ export type ResourceProvider = (uri: URI) => Promise<Resource>;
|
|
|
125
132
|
export declare class DefaultResourceProvider {
|
|
126
133
|
protected readonly resolversProvider: ContributionProvider<ResourceResolver>;
|
|
127
134
|
constructor(resolversProvider: ContributionProvider<ResourceResolver>);
|
|
135
|
+
init(): void;
|
|
128
136
|
/**
|
|
129
137
|
* Reject if a resource cannot be provided.
|
|
130
138
|
*/
|
|
@@ -132,7 +140,7 @@ export declare class DefaultResourceProvider {
|
|
|
132
140
|
}
|
|
133
141
|
export declare class MutableResource implements Resource {
|
|
134
142
|
readonly uri: URI;
|
|
135
|
-
|
|
143
|
+
protected contents: string;
|
|
136
144
|
constructor(uri: URI);
|
|
137
145
|
dispose(): void;
|
|
138
146
|
readContents(): Promise<string>;
|
|
@@ -188,7 +196,8 @@ export declare class UntitledResource implements Resource {
|
|
|
188
196
|
uri: URI;
|
|
189
197
|
private content?;
|
|
190
198
|
protected readonly onDidChangeContentsEmitter: Emitter<void>;
|
|
191
|
-
initiallyDirty: boolean;
|
|
199
|
+
readonly initiallyDirty: boolean;
|
|
200
|
+
readonly autosaveable = false;
|
|
192
201
|
get onDidChangeContents(): Event<void>;
|
|
193
202
|
constructor(resources: Map<string, UntitledResource>, uri: URI, content?: string | undefined);
|
|
194
203
|
dispose(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":"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"}
|
package/lib/common/resource.js
CHANGED
|
@@ -87,6 +87,9 @@ let DefaultResourceProvider = class DefaultResourceProvider {
|
|
|
87
87
|
constructor(resolversProvider) {
|
|
88
88
|
this.resolversProvider = resolversProvider;
|
|
89
89
|
}
|
|
90
|
+
init() {
|
|
91
|
+
this.resolversProvider.getContributions().sort((a, b) => { var _a, _b; return ((_a = b.priority) !== null && _a !== void 0 ? _a : 0) - ((_b = a.priority) !== null && _b !== void 0 ? _b : 0); });
|
|
92
|
+
}
|
|
90
93
|
/**
|
|
91
94
|
* Reject if a resource cannot be provided.
|
|
92
95
|
*/
|
|
@@ -104,6 +107,12 @@ let DefaultResourceProvider = class DefaultResourceProvider {
|
|
|
104
107
|
}
|
|
105
108
|
};
|
|
106
109
|
exports.DefaultResourceProvider = DefaultResourceProvider;
|
|
110
|
+
tslib_1.__decorate([
|
|
111
|
+
(0, inversify_1.postConstruct)(),
|
|
112
|
+
tslib_1.__metadata("design:type", Function),
|
|
113
|
+
tslib_1.__metadata("design:paramtypes", []),
|
|
114
|
+
tslib_1.__metadata("design:returntype", void 0)
|
|
115
|
+
], DefaultResourceProvider.prototype, "init", null);
|
|
107
116
|
exports.DefaultResourceProvider = DefaultResourceProvider = tslib_1.__decorate([
|
|
108
117
|
(0, inversify_1.injectable)(),
|
|
109
118
|
tslib_1.__param(0, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)),
|
|
@@ -168,7 +177,7 @@ let InMemoryResources = class InMemoryResources {
|
|
|
168
177
|
const resourceUri = uri.toString();
|
|
169
178
|
const resource = this.resources.get(resourceUri);
|
|
170
179
|
if (!resource) {
|
|
171
|
-
throw new Error(`Cannot update non-
|
|
180
|
+
throw new Error(`Cannot update non-existent in-memory resource '${resourceUri}'`);
|
|
172
181
|
}
|
|
173
182
|
resource.saveContents(contents);
|
|
174
183
|
return resource;
|
|
@@ -279,6 +288,7 @@ class UntitledResource {
|
|
|
279
288
|
this.uri = uri;
|
|
280
289
|
this.content = content;
|
|
281
290
|
this.onDidChangeContentsEmitter = new event_1.Emitter();
|
|
291
|
+
this.autosaveable = false;
|
|
282
292
|
this.initiallyDirty = (content !== undefined && content.length > 0);
|
|
283
293
|
this.resources.set(this.uri.toString(), this);
|
|
284
294
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/common/resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { LoggerWatcher } from '../common/logger-watcher';
|
|
2
3
|
import { LogLevelCliContribution } from './logger-cli-contribution';
|
|
3
4
|
import { ILoggerServer, ILoggerClient } from '../common/logger-protocol';
|
|
5
|
+
import * as fs from 'fs';
|
|
4
6
|
export declare class ConsoleLoggerServer implements ILoggerServer {
|
|
5
|
-
protected client
|
|
7
|
+
protected client?: ILoggerClient;
|
|
6
8
|
protected watcher: LoggerWatcher;
|
|
7
9
|
protected cli: LogLevelCliContribution;
|
|
10
|
+
protected logFileStream?: fs.WriteStream;
|
|
8
11
|
protected init(): void;
|
|
9
12
|
setLogLevel(name: string, newLogLevel: number): Promise<void>;
|
|
10
13
|
getLogLevel(name: string): Promise<number>;
|
|
11
14
|
log(name: string, logLevel: number, message: string, params: any[]): Promise<void>;
|
|
15
|
+
protected logToFile(message: string, params: any[]): void;
|
|
12
16
|
child(name: string): Promise<void>;
|
|
13
17
|
dispose(): void;
|
|
14
18
|
setClient(client: ILoggerClient | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger-server.d.ts","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"console-logger-server.d.ts","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiC,MAAM,2BAA2B,CAAC;AAGxG,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,qBACa,mBAAoB,YAAW,aAAa;IAErD,SAAS,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAGjC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAGjC,SAAS,CAAC,GAAG,EAAE,uBAAuB,CAAC;IAEvC,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC;IAGzC,SAAS,CAAC,IAAI,IAAI,IAAI;IAUhB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK1C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxF,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAcnD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,OAAO,IAAI,IAAI;IAEf,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;CAIrD"}
|
|
@@ -21,10 +21,10 @@ const inversify_1 = require("inversify");
|
|
|
21
21
|
const logger_watcher_1 = require("../common/logger-watcher");
|
|
22
22
|
const logger_cli_contribution_1 = require("./logger-cli-contribution");
|
|
23
23
|
const logger_protocol_1 = require("../common/logger-protocol");
|
|
24
|
+
const util_1 = require("util");
|
|
25
|
+
const os_1 = require("os");
|
|
26
|
+
const fs = require("fs");
|
|
24
27
|
let ConsoleLoggerServer = class ConsoleLoggerServer {
|
|
25
|
-
constructor() {
|
|
26
|
-
this.client = undefined;
|
|
27
|
-
}
|
|
28
28
|
init() {
|
|
29
29
|
this.setLogLevel(logger_protocol_1.rootLoggerName, this.cli.defaultLogLevel);
|
|
30
30
|
for (const name of Object.keys(this.cli.logLevels)) {
|
|
@@ -51,7 +51,21 @@ let ConsoleLoggerServer = class ConsoleLoggerServer {
|
|
|
51
51
|
async log(name, logLevel, message, params) {
|
|
52
52
|
const configuredLogLevel = await this.getLogLevel(name);
|
|
53
53
|
if (logLevel >= configuredLogLevel) {
|
|
54
|
-
logger_protocol_1.ConsoleLogger.log(name, logLevel, message, params);
|
|
54
|
+
const fullMessage = logger_protocol_1.ConsoleLogger.log(name, logLevel, message, params);
|
|
55
|
+
this.logToFile(fullMessage, params);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
logToFile(message, params) {
|
|
59
|
+
if (this.cli.logFile && !this.logFileStream) {
|
|
60
|
+
this.logFileStream = fs.createWriteStream(this.cli.logFile, { flags: 'a' });
|
|
61
|
+
// Only log errors once to avoid spamming the console
|
|
62
|
+
this.logFileStream.once('error', error => {
|
|
63
|
+
console.error(`Error writing to log file ${this.cli.logFile}`, error);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
if (this.logFileStream) {
|
|
67
|
+
const formatted = (0, util_1.format)(message, ...params) + os_1.EOL;
|
|
68
|
+
this.logFileStream.write(formatted);
|
|
55
69
|
}
|
|
56
70
|
}
|
|
57
71
|
async child(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-logger-server.js","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAA8D;AAC9D,6DAAyD;AACzD,uEAAoE;AACpE,+DAAwG;
|
|
1
|
+
{"version":3,"file":"console-logger-server.js","sourceRoot":"","sources":["../../src/node/console-logger-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAsD,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"logger-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGnE,OAAO,EAAE,aAAa,EAAsD,MAAM,2BAA2B,CAAC;AAQ9G,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;IACtD,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC1F,GAAG,IAAI,CAmBP;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,iBAiC9B,CAAC"}
|
|
@@ -25,10 +25,9 @@ const logger_watcher_1 = require("../common/logger-watcher");
|
|
|
25
25
|
const backend_application_1 = require("./backend-application");
|
|
26
26
|
const cli_1 = require("./cli");
|
|
27
27
|
const logger_cli_contribution_1 = require("./logger-cli-contribution");
|
|
28
|
+
const logger_binding_1 = require("../common/logger-binding");
|
|
28
29
|
function bindLogger(bind, props) {
|
|
29
|
-
|
|
30
|
-
bind(logger_1.ILogger).to(logger_1.Logger).inSingletonScope().whenTargetIsDefault();
|
|
31
|
-
bind(logger_watcher_1.LoggerWatcher).toSelf().inSingletonScope();
|
|
30
|
+
(0, logger_binding_1.bindCommonLogger)(bind);
|
|
32
31
|
bind(logger_protocol_1.ILoggerServer).to(console_logger_server_1.ConsoleLoggerServer).inSingletonScope().onActivation((context, server) => {
|
|
33
32
|
if (props && props.onLoggerServerActivation) {
|
|
34
33
|
props.onLoggerServerActivation(context, server);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAAmE;AACnE,mDAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"logger-backend-module.js","sourceRoot":"","sources":["../../src/node/logger-backend-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,11 @@ export declare class LogLevelCliContribution implements CliContribution {
|
|
|
17
17
|
* Log level to use for loggers not specified in `logLevels`.
|
|
18
18
|
*/
|
|
19
19
|
protected _defaultLogLevel: LogLevel;
|
|
20
|
+
protected _logFile?: string;
|
|
20
21
|
protected logConfigChangedEvent: Emitter<void>;
|
|
21
22
|
get defaultLogLevel(): LogLevel;
|
|
22
23
|
get logLevels(): LogLevels;
|
|
24
|
+
get logFile(): string | undefined;
|
|
23
25
|
configure(conf: yargs.Argv): void;
|
|
24
26
|
setArguments(args: yargs.Arguments): Promise<void>;
|
|
25
27
|
protected watchLogConfigFile(filename: string): Promise<void>;
|