@theia/core 1.70.0-next.7 → 1.70.0-next.71
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 +3 -3
- package/lib/browser/about-dialog.d.ts.map +1 -1
- package/lib/browser/about-dialog.js +3 -1
- package/lib/browser/about-dialog.js.map +1 -1
- package/lib/browser/catalog.json +83 -7
- package/lib/browser/common-frontend-contribution.d.ts +0 -2
- package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/common-frontend-contribution.js +39 -15
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/frontend-application-module.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.js +1 -0
- package/lib/browser/frontend-application-module.js.map +1 -1
- package/lib/browser/hover-service.d.ts.map +1 -1
- package/lib/browser/hover-service.js +5 -3
- package/lib/browser/hover-service.js.map +1 -1
- package/lib/browser/markdown-rendering/markdown-renderer.d.ts +1 -1
- package/lib/browser/markdown-rendering/markdown-renderer.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.js +9 -1
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/browser/quick-input/quick-input-service.spec.js +53 -9
- package/lib/browser/quick-input/quick-input-service.spec.js.map +1 -1
- package/lib/browser/saveable-service.d.ts +24 -1
- package/lib/browser/saveable-service.d.ts.map +1 -1
- package/lib/browser/saveable-service.js +34 -3
- package/lib/browser/saveable-service.js.map +1 -1
- package/lib/browser/tree/fuzzy-search.d.ts +1 -60
- package/lib/browser/tree/fuzzy-search.d.ts.map +1 -1
- package/lib/browser/tree/fuzzy-search.js +3 -58
- package/lib/browser/tree/fuzzy-search.js.map +1 -1
- package/lib/browser/tree/tree-view-welcome-widget.d.ts.map +1 -1
- package/lib/browser/tree/tree-view-welcome-widget.js +1 -2
- package/lib/browser/tree/tree-view-welcome-widget.js.map +1 -1
- package/lib/browser/widgets/select-component.d.ts +1 -0
- package/lib/browser/widgets/select-component.d.ts.map +1 -1
- package/lib/browser/widgets/select-component.js +30 -0
- package/lib/browser/widgets/select-component.js.map +1 -1
- package/lib/browser/window/default-window-service.d.ts +2 -1
- package/lib/browser/window/default-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-window-service.js +5 -1
- package/lib/browser/window/default-window-service.js.map +1 -1
- package/lib/browser/window/test/mock-window-service.d.ts +2 -1
- package/lib/browser/window/test/mock-window-service.d.ts.map +1 -1
- package/lib/browser/window/test/mock-window-service.js +2 -1
- package/lib/browser/window/test/mock-window-service.js.map +1 -1
- package/lib/browser/window/window-service.d.ts +8 -1
- package/lib/browser/window/window-service.d.ts.map +1 -1
- package/lib/common/fuzzy-match-utils.d.ts +27 -0
- package/lib/common/fuzzy-match-utils.d.ts.map +1 -0
- package/lib/common/fuzzy-match-utils.js +96 -0
- package/lib/common/fuzzy-match-utils.js.map +1 -0
- package/lib/common/fuzzy-match-utils.spec.d.ts +2 -0
- package/lib/common/fuzzy-match-utils.spec.d.ts.map +1 -0
- package/lib/common/fuzzy-match-utils.spec.js +109 -0
- package/lib/common/fuzzy-match-utils.spec.js.map +1 -0
- package/lib/common/fuzzy-search.d.ts +63 -0
- package/lib/common/fuzzy-search.d.ts.map +1 -0
- package/lib/common/fuzzy-search.js +101 -0
- package/lib/common/fuzzy-search.js.map +1 -0
- package/lib/common/fuzzy-search.spec.d.ts.map +1 -0
- package/lib/{browser/tree → common}/fuzzy-search.spec.js +20 -1
- package/lib/common/fuzzy-search.spec.js.map +1 -0
- package/lib/common/logger-sanitizer.d.ts +9 -0
- package/lib/common/logger-sanitizer.d.ts.map +1 -1
- package/lib/common/logger-sanitizer.js +26 -3
- package/lib/common/logger-sanitizer.js.map +1 -1
- package/lib/common/logger-sanitizer.spec.js +41 -0
- package/lib/common/logger-sanitizer.spec.js.map +1 -1
- package/lib/common/preferences/injectable-preference-proxy.d.ts +5 -3
- package/lib/common/preferences/injectable-preference-proxy.d.ts.map +1 -1
- package/lib/common/preferences/injectable-preference-proxy.js +9 -6
- package/lib/common/preferences/injectable-preference-proxy.js.map +1 -1
- package/lib/common/preferences/preference-configurations.d.ts +2 -2
- package/lib/common/preferences/preference-configurations.d.ts.map +1 -1
- package/lib/common/preferences/preference-configurations.js +1 -1
- package/lib/common/preferences/preference-configurations.js.map +1 -1
- package/lib/common/preferences/preference-provider-impl.d.ts +4 -3
- package/lib/common/preferences/preference-provider-impl.d.ts.map +1 -1
- package/lib/common/preferences/preference-provider-impl.js +9 -6
- package/lib/common/preferences/preference-provider-impl.js.map +1 -1
- package/lib/common/preferences/preference-proxy.d.ts +4 -2
- package/lib/common/preferences/preference-proxy.d.ts.map +1 -1
- package/lib/common/preferences/preference-proxy.js +4 -5
- package/lib/common/preferences/preference-proxy.js.map +1 -1
- package/lib/common/preferences/preference-service.d.ts +4 -3
- package/lib/common/preferences/preference-service.d.ts.map +1 -1
- package/lib/common/preferences/preference-service.js +13 -10
- package/lib/common/preferences/preference-service.js.map +1 -1
- package/lib/common/quick-pick-service.d.ts +18 -2
- package/lib/common/quick-pick-service.d.ts.map +1 -1
- package/lib/common/quick-pick-service.js +53 -8
- package/lib/common/quick-pick-service.js.map +1 -1
- package/lib/common/uri.js +1 -1
- package/lib/common/uri.js.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +4 -6
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.js +3 -3
- package/lib/electron-browser/menu/electron-menu-contribution.js.map +1 -1
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.d.ts +2 -0
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.d.ts.map +1 -1
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.js +5 -3
- package/lib/electron-browser/messaging/electron-local-ws-connection-source.js.map +1 -1
- package/lib/electron-browser/preload.js +2 -2
- package/lib/electron-browser/preload.js.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts +4 -0
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.js +32 -0
- package/lib/electron-browser/window/electron-secondary-window-service.js.map +1 -1
- package/lib/electron-browser/window/electron-window-module.d.ts +1 -0
- package/lib/electron-browser/window/electron-window-module.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-window-module.js +4 -0
- package/lib/electron-browser/window/electron-window-module.js.map +1 -1
- package/lib/electron-browser/window/electron-window-service.d.ts +3 -2
- package/lib/electron-browser/window/electron-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-window-service.js +7 -4
- package/lib/electron-browser/window/electron-window-service.js.map +1 -1
- package/lib/electron-browser/window/window-zoom-action-bar.d.ts +21 -0
- package/lib/electron-browser/window/window-zoom-action-bar.d.ts.map +1 -0
- package/lib/electron-browser/window/window-zoom-action-bar.js +71 -0
- package/lib/electron-browser/window/window-zoom-action-bar.js.map +1 -0
- package/lib/electron-browser/window/window-zoom-status-bar-item.d.ts +14 -0
- package/lib/electron-browser/window/window-zoom-status-bar-item.d.ts.map +1 -0
- package/lib/electron-browser/window/window-zoom-status-bar-item.js +87 -0
- package/lib/electron-browser/window/window-zoom-status-bar-item.js.map +1 -0
- package/lib/electron-common/electron-api.d.ts +1 -1
- package/lib/electron-common/electron-api.d.ts.map +1 -1
- package/lib/electron-common/electron-main-window-service.d.ts +2 -1
- package/lib/electron-common/electron-main-window-service.d.ts.map +1 -1
- package/lib/electron-common/electron-window-preferences.d.ts +5 -2
- package/lib/electron-common/electron-window-preferences.d.ts.map +1 -1
- package/lib/electron-common/electron-window-preferences.js +16 -10
- package/lib/electron-common/electron-window-preferences.js.map +1 -1
- package/lib/electron-main/electron-api-main.d.ts.map +1 -1
- package/lib/electron-main/electron-api-main.js +14 -2
- package/lib/electron-main/electron-api-main.js.map +1 -1
- package/lib/electron-main/electron-main-application.d.ts +1 -0
- package/lib/electron-main/electron-main-application.d.ts.map +1 -1
- package/lib/electron-main/electron-main-application.js +6 -0
- package/lib/electron-main/electron-main-application.js.map +1 -1
- package/lib/electron-main/electron-main-window-service-impl.d.ts +2 -1
- package/lib/electron-main/electron-main-window-service-impl.d.ts.map +1 -1
- package/lib/electron-main/electron-main-window-service-impl.js +6 -2
- package/lib/electron-main/electron-main-window-service-impl.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/about-dialog.tsx +3 -1
- package/src/browser/common-frontend-contribution.ts +36 -17
- package/src/browser/frontend-application-module.ts +2 -1
- package/src/browser/hover-service.ts +5 -3
- package/src/browser/markdown-rendering/markdown-renderer.ts +1 -1
- package/src/browser/menu/browser-menu-plugin.ts +9 -1
- package/src/browser/quick-input/quick-input-service.spec.ts +58 -9
- package/src/browser/saveable-service.ts +56 -4
- package/src/browser/style/hover-service.css +1 -0
- package/src/browser/style/index.css +1 -1
- package/src/browser/tree/fuzzy-search.ts +2 -120
- package/src/browser/tree/tree-view-welcome-widget.tsx +1 -2
- package/src/browser/widgets/select-component.tsx +39 -2
- package/src/browser/window/default-window-service.ts +6 -1
- package/src/browser/window/test/mock-window-service.ts +2 -1
- package/src/browser/window/window-service.ts +9 -1
- package/src/common/fuzzy-match-utils.spec.ts +141 -0
- package/src/common/fuzzy-match-utils.ts +78 -0
- package/src/{browser/tree → common}/fuzzy-search.spec.ts +23 -1
- package/src/common/fuzzy-search.ts +158 -0
- package/src/common/i18n/nls.metadata.json +25379 -24577
- package/src/common/logger-sanitizer.spec.ts +54 -1
- package/src/common/logger-sanitizer.ts +38 -3
- package/src/common/preferences/injectable-preference-proxy.ts +6 -3
- package/src/common/preferences/preference-configurations.ts +2 -2
- package/src/common/preferences/preference-provider-impl.ts +6 -3
- package/src/common/preferences/preference-proxy.ts +6 -4
- package/src/common/preferences/preference-service.ts +6 -3
- package/src/common/quick-pick-service.ts +65 -11
- package/src/common/uri.ts +1 -1
- package/src/electron-browser/menu/electron-main-menu-factory.ts +4 -6
- package/src/electron-browser/menu/electron-menu-contribution.ts +4 -4
- package/src/electron-browser/messaging/electron-local-ws-connection-source.ts +4 -2
- package/src/electron-browser/preload.ts +2 -2
- package/src/electron-browser/style/window-zoom-action-bar.css +57 -0
- package/src/electron-browser/window/electron-secondary-window-service.ts +32 -1
- package/src/electron-browser/window/electron-window-module.ts +4 -0
- package/src/electron-browser/window/electron-window-service.ts +10 -7
- package/src/electron-browser/window/window-zoom-action-bar.tsx +115 -0
- package/src/electron-browser/window/window-zoom-status-bar-item.ts +81 -0
- package/src/electron-common/electron-api.ts +1 -1
- package/src/electron-common/electron-main-window-service.ts +2 -1
- package/src/electron-common/electron-window-preferences.ts +19 -11
- package/src/electron-main/electron-api-main.ts +12 -2
- package/src/electron-main/electron-main-application.ts +7 -0
- package/src/electron-main/electron-main-window-service-impl.ts +7 -2
- package/lib/browser/tree/fuzzy-search.spec.d.ts.map +0 -1
- package/lib/browser/tree/fuzzy-search.spec.js.map +0 -1
- /package/lib/{browser/tree → common}/fuzzy-search.spec.d.ts +0 -0
|
@@ -295,7 +295,15 @@ class DynamicMenuWidget extends widgets_1.Menu {
|
|
|
295
295
|
const enabled = node.isEnabled(nodePath, ...(this.args || []));
|
|
296
296
|
const toggled = node.isToggled ? !!node.isToggled(nodePath, ...(this.args || [])) : false;
|
|
297
297
|
phCommandRegistry.addCommand(id, {
|
|
298
|
-
execute: () => {
|
|
298
|
+
execute: () => {
|
|
299
|
+
// Restore focus to the previously focused element before executing
|
|
300
|
+
// the command so that focus-dependent commands like clipboard
|
|
301
|
+
// operations target the correct element instead of the menu.
|
|
302
|
+
if (this.previousFocusedElement) {
|
|
303
|
+
this.previousFocusedElement.focus({ preventScroll: true });
|
|
304
|
+
}
|
|
305
|
+
node.run(nodePath, ...(this.args || []));
|
|
306
|
+
},
|
|
299
307
|
isEnabled: () => enabled,
|
|
300
308
|
isToggled: () => toggled,
|
|
301
309
|
isVisible: () => true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,11 +20,13 @@ const quick_input_service_1 = require("./quick-input-service");
|
|
|
20
20
|
const expect = chai.expect;
|
|
21
21
|
describe('quick-input-service', () => {
|
|
22
22
|
describe('#findMatches', () => {
|
|
23
|
-
it('should return
|
|
23
|
+
it('should return a single contiguous range for substring matches', () => {
|
|
24
24
|
expect((0, quick_input_service_1.findMatches)('abc', 'a')).deep.equal([{ start: 0, end: 1 }]);
|
|
25
|
-
expect((0, quick_input_service_1.findMatches)('abc', 'ab')).deep.equal([{ start: 0, end:
|
|
25
|
+
expect((0, quick_input_service_1.findMatches)('abc', 'ab')).deep.equal([{ start: 0, end: 2 }]);
|
|
26
|
+
expect((0, quick_input_service_1.findMatches)('abc', 'abc')).deep.equal([{ start: 0, end: 3 }]);
|
|
27
|
+
});
|
|
28
|
+
it('should return per-character ranges for fuzzy-only matches', () => {
|
|
26
29
|
expect((0, quick_input_service_1.findMatches)('abc', 'ac')).deep.equal([{ start: 0, end: 1 }, { start: 2, end: 3 }]);
|
|
27
|
-
expect((0, quick_input_service_1.findMatches)('abc', 'abc')).deep.equal([{ start: 0, end: 1 }, { start: 1, end: 2 }, { start: 2, end: 3 }]);
|
|
28
30
|
});
|
|
29
31
|
it('should fail when out of order', () => {
|
|
30
32
|
expect((0, quick_input_service_1.findMatches)('abc', 'ba')).equal(undefined);
|
|
@@ -55,9 +57,7 @@ describe('quick-input-service', () => {
|
|
|
55
57
|
label: 'abc',
|
|
56
58
|
highlights: {
|
|
57
59
|
label: [
|
|
58
|
-
{ start: 0, end:
|
|
59
|
-
{ start: 1, end: 2 },
|
|
60
|
-
{ start: 2, end: 3 }
|
|
60
|
+
{ start: 0, end: 3 }
|
|
61
61
|
]
|
|
62
62
|
}
|
|
63
63
|
};
|
|
@@ -134,9 +134,7 @@ describe('quick-input-service', () => {
|
|
|
134
134
|
label: 'abc',
|
|
135
135
|
highlights: {
|
|
136
136
|
label: [
|
|
137
|
-
{ start: 0, end:
|
|
138
|
-
{ start: 1, end: 2 },
|
|
139
|
-
{ start: 2, end: 3 }
|
|
137
|
+
{ start: 0, end: 3 }
|
|
140
138
|
]
|
|
141
139
|
}
|
|
142
140
|
};
|
|
@@ -150,6 +148,52 @@ describe('quick-input-service', () => {
|
|
|
150
148
|
it('should return an empty list when no matches are found', () => {
|
|
151
149
|
expect((0, quick_input_service_1.filterItems)(items, 'yyy')).deep.equal([]);
|
|
152
150
|
});
|
|
151
|
+
it('should rank substring matches before fuzzy-only matches', () => {
|
|
152
|
+
const testItems = [
|
|
153
|
+
{ label: 'reformatting' },
|
|
154
|
+
{ label: 'fontSize' },
|
|
155
|
+
{ label: 'fontFamily' },
|
|
156
|
+
];
|
|
157
|
+
const result = (0, quick_input_service_1.filterItems)(testItems, 'font').filter(quick_input_service_1.QuickPickItem.is);
|
|
158
|
+
expect(result).length(2);
|
|
159
|
+
expect(result[0].label).equal('fontSize');
|
|
160
|
+
expect(result[1].label).equal('fontFamily');
|
|
161
|
+
});
|
|
162
|
+
it('should rank prefix matches before other substring matches', () => {
|
|
163
|
+
const testItems = [
|
|
164
|
+
{ label: 'setFont' },
|
|
165
|
+
{ label: 'fontSize' },
|
|
166
|
+
{ label: 'fontFamily' },
|
|
167
|
+
];
|
|
168
|
+
const result = (0, quick_input_service_1.filterItems)(testItems, 'font').filter(quick_input_service_1.QuickPickItem.is);
|
|
169
|
+
expect(result).length(3);
|
|
170
|
+
expect(result[0].label).equal('fontSize');
|
|
171
|
+
expect(result[1].label).equal('fontFamily');
|
|
172
|
+
expect(result[2].label).equal('setFont');
|
|
173
|
+
});
|
|
174
|
+
it('should treat segmented prefix matches as prefix matches', () => {
|
|
175
|
+
const testItems = [
|
|
176
|
+
{ label: 'backend-workspace-service.ts' },
|
|
177
|
+
{ label: 'workspace-backend-service.ts' },
|
|
178
|
+
];
|
|
179
|
+
const result = (0, quick_input_service_1.filterItems)(testItems, 'works-ser').filter(quick_input_service_1.QuickPickItem.is);
|
|
180
|
+
expect(result).length(2);
|
|
181
|
+
expect(result[0].label).equal('workspace-backend-service.ts');
|
|
182
|
+
expect(result[1].label).equal('backend-workspace-service.ts');
|
|
183
|
+
});
|
|
184
|
+
it('should drop separators when their group has no matches', () => {
|
|
185
|
+
const testItems = [
|
|
186
|
+
{ type: 'separator', label: 'Group A' },
|
|
187
|
+
{ label: 'fontSize' },
|
|
188
|
+
{ type: 'separator', label: 'Group B' },
|
|
189
|
+
{ label: 'xyz' },
|
|
190
|
+
];
|
|
191
|
+
const result = (0, quick_input_service_1.filterItems)(testItems, 'font');
|
|
192
|
+
// Group B's only item "xyz" doesn't match, so Group B separator is dropped
|
|
193
|
+
expect(result).length(2);
|
|
194
|
+
expect(result[0]).to.have.property('type', 'separator');
|
|
195
|
+
expect(result[1]).to.have.property('label', 'fontSize');
|
|
196
|
+
});
|
|
153
197
|
});
|
|
154
198
|
});
|
|
155
199
|
//# sourceMappingURL=quick-input-service.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-input-service.spec.js","sourceRoot":"","sources":["../../../src/browser/quick-input/quick-input-service.spec.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,6BAA6B;AAC7B,+DAAgF;AAEhF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAE3B,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAEjC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAE1B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"quick-input-service.spec.js","sourceRoot":"","sources":["../../../src/browser/quick-input/quick-input-service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,25 +14,48 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import type { ApplicationShell } from './shell';
|
|
17
|
-
import { URI, Disposable, Emitter, Event } from '../common';
|
|
17
|
+
import { ContributionProvider, URI, Disposable, Emitter, Event } from '../common';
|
|
18
18
|
import { Navigatable } from './navigatable-types';
|
|
19
19
|
import { AutoSaveMode, Saveable, SaveableSource, SaveableWidget, SaveOptions, PostCreationSaveableWidget } from './saveable';
|
|
20
20
|
import { Widget } from './widgets';
|
|
21
21
|
import { FrontendApplicationContribution } from './frontend-application-contribution';
|
|
22
22
|
import { FrontendApplication } from './frontend-application';
|
|
23
|
+
export declare const SaveErrorChecker: unique symbol;
|
|
24
|
+
/**
|
|
25
|
+
* Contribution point for checking whether a given URI has errors.
|
|
26
|
+
* When `files.autoSaveWhenNoErrors` is enabled, auto-save will be suppressed
|
|
27
|
+
* for files where any registered checker reports errors.
|
|
28
|
+
*/
|
|
29
|
+
export interface SaveErrorChecker {
|
|
30
|
+
/**
|
|
31
|
+
* Returns `true` if the given URI has errors that should prevent auto-save.
|
|
32
|
+
*/
|
|
33
|
+
hasErrors(uri: URI): boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Event fired when the error state may have changed (e.g. diagnostics updated).
|
|
36
|
+
* The SaveableService listens to this to re-evaluate auto-save for dirty widgets.
|
|
37
|
+
*/
|
|
38
|
+
onDidErrorStateChange: Event<void>;
|
|
39
|
+
}
|
|
23
40
|
export declare class SaveableService implements FrontendApplicationContribution {
|
|
41
|
+
protected readonly errorCheckers: ContributionProvider<SaveErrorChecker>;
|
|
24
42
|
protected saveThrottles: Map<Widget, AutoSaveThrottle>;
|
|
25
43
|
protected saveMode: AutoSaveMode;
|
|
26
44
|
protected saveDelay: number;
|
|
45
|
+
protected saveWhenNoErrors: boolean;
|
|
27
46
|
protected shell: ApplicationShell;
|
|
28
47
|
protected readonly onDidAutoSaveChangeEmitter: Emitter<AutoSaveMode>;
|
|
29
48
|
protected readonly onDidAutoSaveDelayChangeEmitter: Emitter<number>;
|
|
49
|
+
protected readonly onDidAutoSaveConditionsChangeEmitter: Emitter<void>;
|
|
30
50
|
get onDidAutoSaveChange(): Event<AutoSaveMode>;
|
|
31
51
|
get onDidAutoSaveDelayChange(): Event<number>;
|
|
52
|
+
get onDidAutoSaveConditionsChange(): Event<void>;
|
|
32
53
|
get autoSave(): AutoSaveMode;
|
|
33
54
|
set autoSave(value: AutoSaveMode);
|
|
34
55
|
get autoSaveDelay(): number;
|
|
35
56
|
set autoSaveDelay(value: number);
|
|
57
|
+
get autoSaveWhenNoErrors(): boolean;
|
|
58
|
+
set autoSaveWhenNoErrors(value: boolean);
|
|
36
59
|
onDidInitializeLayout(app: FrontendApplication): void;
|
|
37
60
|
protected updateAutoSaveMode(mode: AutoSaveMode): void;
|
|
38
61
|
protected updateAutoSaveDelay(delay: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveable-service.d.ts","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,EAAmB,GAAG,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"saveable-service.d.ts","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAmB,GAAG,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACzH,OAAO,EAAE,WAAW,EAAqB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAA+B,0BAA0B,EAAoB,MAAM,YAAY,CAAC;AAC5K,OAAO,EAAiB,MAAM,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;IAC7B;;;OAGG;IACH,qBAAqB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CACtC;AAED,qBACa,eAAgB,YAAW,+BAA+B;IAGnE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAEzE,SAAS,CAAC,aAAa,gCAAuC;IAC9D,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAS;IACzC,SAAS,CAAC,SAAS,SAAQ;IAC3B,SAAS,CAAC,gBAAgB,UAAS;IACnC,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAElC,SAAS,CAAC,QAAQ,CAAC,0BAA0B,wBAA+B;IAC5E,SAAS,CAAC,QAAQ,CAAC,+BAA+B,kBAAyB;IAC3E,SAAS,CAAC,QAAQ,CAAC,oCAAoC,gBAAuB;IAE9E,IAAI,mBAAmB,IAAI,KAAK,CAAC,YAAY,CAAC,CAE7C;IAED,IAAI,wBAAwB,IAAI,KAAK,CAAC,MAAM,CAAC,CAE5C;IAED,IAAI,6BAA6B,IAAI,KAAK,CAAC,IAAI,CAAC,CAE/C;IAED,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,IAAI,QAAQ,CAAC,KAAK,EAAE,YAAY,EAE/B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,EAE9B;IAED,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAEtC;IAED,qBAAqB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAsCrD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAqBtD,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlD,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,UAAU;IAkBhE,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,UAAU;IAezE,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAUrD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAiBrE,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAoBvE,SAAS,CAAC,qBAAqB,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;cAgBjG,eAAe,CAAC,MAAM,EAAE,0BAA0B,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAgBzG,gBAAgB,CAAC,MAAM,EAAE,0BAA0B,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,YAAY,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAuBzH,kBAAkB,CAAC,MAAM,EAAE,0BAA0B,EAAE,QAAQ,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/G;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,CAAC,QAAQ,GAAG,cAAc,CAAC;IAIxE,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,CAAC,QAAQ,GAAG,cAAc,CAAC;IAKjF;;;;OAIG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IASvF,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,IAAI,MAAM,GAAG,cAAc,GAAG,WAAW;IAI/E,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CAG/G;AAED,qBAAa,gBAAiB,YAAW,UAAU;IAE/C,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,SAAS,CAAC,CAA8B;gBAEpC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,IAAI,EAAE,GAAG,WAAW,EAAE,UAAU,EAAE;IAwBhH,SAAS,CAAC,aAAa,CAAC,KAAK,UAAQ,GAAG,IAAI;IAgB5C,OAAO,IAAI,IAAI;CAIlB"}
|
|
@@ -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.AutoSaveThrottle = exports.SaveableService = void 0;
|
|
18
|
+
exports.AutoSaveThrottle = exports.SaveableService = exports.SaveErrorChecker = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("inversify");
|
|
21
21
|
const common_1 = require("../common");
|
|
@@ -23,13 +23,16 @@ const navigatable_types_1 = require("./navigatable-types");
|
|
|
23
23
|
const saveable_1 = require("./saveable");
|
|
24
24
|
const widgets_1 = require("./widgets");
|
|
25
25
|
const throttle = require("lodash.throttle");
|
|
26
|
+
exports.SaveErrorChecker = Symbol('SaveErrorChecker');
|
|
26
27
|
let SaveableService = class SaveableService {
|
|
27
28
|
constructor() {
|
|
28
29
|
this.saveThrottles = new Map();
|
|
29
30
|
this.saveMode = 'off';
|
|
30
31
|
this.saveDelay = 1000;
|
|
32
|
+
this.saveWhenNoErrors = false;
|
|
31
33
|
this.onDidAutoSaveChangeEmitter = new common_1.Emitter();
|
|
32
34
|
this.onDidAutoSaveDelayChangeEmitter = new common_1.Emitter();
|
|
35
|
+
this.onDidAutoSaveConditionsChangeEmitter = new common_1.Emitter();
|
|
33
36
|
}
|
|
34
37
|
get onDidAutoSaveChange() {
|
|
35
38
|
return this.onDidAutoSaveChangeEmitter.event;
|
|
@@ -37,6 +40,9 @@ let SaveableService = class SaveableService {
|
|
|
37
40
|
get onDidAutoSaveDelayChange() {
|
|
38
41
|
return this.onDidAutoSaveDelayChangeEmitter.event;
|
|
39
42
|
}
|
|
43
|
+
get onDidAutoSaveConditionsChange() {
|
|
44
|
+
return this.onDidAutoSaveConditionsChangeEmitter.event;
|
|
45
|
+
}
|
|
40
46
|
get autoSave() {
|
|
41
47
|
return this.saveMode;
|
|
42
48
|
}
|
|
@@ -49,8 +55,20 @@ let SaveableService = class SaveableService {
|
|
|
49
55
|
set autoSaveDelay(value) {
|
|
50
56
|
this.updateAutoSaveDelay(value);
|
|
51
57
|
}
|
|
58
|
+
get autoSaveWhenNoErrors() {
|
|
59
|
+
return this.saveWhenNoErrors;
|
|
60
|
+
}
|
|
61
|
+
set autoSaveWhenNoErrors(value) {
|
|
62
|
+
this.saveWhenNoErrors = value;
|
|
63
|
+
}
|
|
52
64
|
onDidInitializeLayout(app) {
|
|
53
65
|
this.shell = app.shell;
|
|
66
|
+
// Listen to error state changes from all registered error checkers
|
|
67
|
+
for (const checker of this.errorCheckers.getContributions()) {
|
|
68
|
+
checker.onDidErrorStateChange(() => {
|
|
69
|
+
this.onDidAutoSaveConditionsChangeEmitter.fire();
|
|
70
|
+
});
|
|
71
|
+
}
|
|
54
72
|
// Register restored editors first
|
|
55
73
|
for (const widget of this.shell.widgets) {
|
|
56
74
|
const saveable = saveable_1.Saveable.get(widget);
|
|
@@ -146,9 +164,15 @@ let SaveableService = class SaveableService {
|
|
|
146
164
|
// Never auto-save untitled documents
|
|
147
165
|
return false;
|
|
148
166
|
}
|
|
149
|
-
|
|
150
|
-
return
|
|
167
|
+
if (saveable.autosaveable === false || !saveable.dirty) {
|
|
168
|
+
return false;
|
|
169
|
+
}
|
|
170
|
+
if (this.saveWhenNoErrors && uri) {
|
|
171
|
+
if (this.errorCheckers.getContributions().some(checker => checker.hasErrors(uri))) {
|
|
172
|
+
return false;
|
|
173
|
+
}
|
|
151
174
|
}
|
|
175
|
+
return true;
|
|
152
176
|
}
|
|
153
177
|
applySaveableWidget(widget, saveable) {
|
|
154
178
|
if (saveable_1.SaveableWidget.is(widget)) {
|
|
@@ -263,6 +287,11 @@ let SaveableService = class SaveableService {
|
|
|
263
287
|
}
|
|
264
288
|
};
|
|
265
289
|
exports.SaveableService = SaveableService;
|
|
290
|
+
tslib_1.__decorate([
|
|
291
|
+
(0, inversify_1.inject)(common_1.ContributionProvider),
|
|
292
|
+
(0, inversify_1.named)(exports.SaveErrorChecker),
|
|
293
|
+
tslib_1.__metadata("design:type", Object)
|
|
294
|
+
], SaveableService.prototype, "errorCheckers", void 0);
|
|
266
295
|
exports.SaveableService = SaveableService = tslib_1.__decorate([
|
|
267
296
|
(0, inversify_1.injectable)()
|
|
268
297
|
], SaveableService);
|
|
@@ -279,6 +308,8 @@ class AutoSaveThrottle {
|
|
|
279
308
|
this.throttledSave();
|
|
280
309
|
}), saveService.onDidAutoSaveDelayChange(() => {
|
|
281
310
|
this.throttledSave(true);
|
|
311
|
+
}), saveService.onDidAutoSaveConditionsChange(() => {
|
|
312
|
+
this.throttledSave();
|
|
282
313
|
}));
|
|
283
314
|
}
|
|
284
315
|
throttledSave(reset = false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveable-service.js","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAGlF,
|
|
1
|
+
{"version":3,"file":"saveable-service.js","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,61 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare class FuzzySearch {
|
|
3
|
-
private static readonly PRE;
|
|
4
|
-
private static readonly POST;
|
|
5
|
-
/**
|
|
6
|
-
* Filters the input and returns with an array that contains all items that match the pattern.
|
|
7
|
-
*/
|
|
8
|
-
filter<T>(input: FuzzySearch.Input<T>): Promise<FuzzySearch.Match<T>[]>;
|
|
9
|
-
protected sortResults<T>(left: fuzzy.FilterResult<T>, right: fuzzy.FilterResult<T>): number;
|
|
10
|
-
protected mapResult<T>(result: fuzzy.FilterResult<T>): FuzzySearch.Match<T>;
|
|
11
|
-
protected mapRanges(input: string): ReadonlyArray<FuzzySearch.Range>;
|
|
12
|
-
}
|
|
13
|
-
/**
|
|
14
|
-
* Fuzzy searcher.
|
|
15
|
-
*/
|
|
16
|
-
export declare namespace FuzzySearch {
|
|
17
|
-
/**
|
|
18
|
-
* A range representing the match region.
|
|
19
|
-
*/
|
|
20
|
-
interface Range {
|
|
21
|
-
/**
|
|
22
|
-
* The zero based offset of the match region.
|
|
23
|
-
*/
|
|
24
|
-
readonly offset: number;
|
|
25
|
-
/**
|
|
26
|
-
* The length of the match region.
|
|
27
|
-
*/
|
|
28
|
-
readonly length: number;
|
|
29
|
-
}
|
|
30
|
-
/**
|
|
31
|
-
* A fuzzy search match.
|
|
32
|
-
*/
|
|
33
|
-
interface Match<T> {
|
|
34
|
-
/**
|
|
35
|
-
* The original item.
|
|
36
|
-
*/
|
|
37
|
-
readonly item: T;
|
|
38
|
-
/**
|
|
39
|
-
* An array of ranges representing the match regions.
|
|
40
|
-
*/
|
|
41
|
-
readonly ranges: ReadonlyArray<Range>;
|
|
42
|
-
}
|
|
43
|
-
/**
|
|
44
|
-
* The fuzzy search input.
|
|
45
|
-
*/
|
|
46
|
-
interface Input<T> {
|
|
47
|
-
/**
|
|
48
|
-
* The pattern to match.
|
|
49
|
-
*/
|
|
50
|
-
readonly pattern: string;
|
|
51
|
-
/**
|
|
52
|
-
* The items to filter based on the `pattern`.
|
|
53
|
-
*/
|
|
54
|
-
readonly items: ReadonlyArray<T>;
|
|
55
|
-
/**
|
|
56
|
-
* Function that extracts the string from the inputs which will be used to evaluate the fuzzy matching filter.
|
|
57
|
-
*/
|
|
58
|
-
readonly transform: (item: T) => string;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
1
|
+
export { FuzzySearch } from '../../common/fuzzy-search';
|
|
61
2
|
//# sourceMappingURL=fuzzy-search.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuzzy-search.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fuzzy-search.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC"}
|
|
@@ -14,64 +14,9 @@
|
|
|
14
14
|
//
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
|
-
var FuzzySearch_1;
|
|
18
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
18
|
exports.FuzzySearch = void 0;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
let FuzzySearch = class FuzzySearch {
|
|
24
|
-
static { FuzzySearch_1 = this; }
|
|
25
|
-
static { this.PRE = '\x01'; }
|
|
26
|
-
static { this.POST = '\x02'; }
|
|
27
|
-
/**
|
|
28
|
-
* Filters the input and returns with an array that contains all items that match the pattern.
|
|
29
|
-
*/
|
|
30
|
-
async filter(input) {
|
|
31
|
-
return fuzzy.filter(input.pattern, input.items.slice(), {
|
|
32
|
-
pre: FuzzySearch_1.PRE,
|
|
33
|
-
post: FuzzySearch_1.POST,
|
|
34
|
-
extract: input.transform
|
|
35
|
-
}).sort(this.sortResults.bind(this)).map(this.mapResult.bind(this));
|
|
36
|
-
}
|
|
37
|
-
sortResults(left, right) {
|
|
38
|
-
return left.index - right.index;
|
|
39
|
-
}
|
|
40
|
-
mapResult(result) {
|
|
41
|
-
return {
|
|
42
|
-
item: result.original,
|
|
43
|
-
ranges: this.mapRanges(result.string)
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
mapRanges(input) {
|
|
47
|
-
const copy = input.split('').filter(s => s !== '');
|
|
48
|
-
const ranges = [];
|
|
49
|
-
const validate = (pre, post) => {
|
|
50
|
-
if (preIndex > postIndex || (preIndex === -1) !== (postIndex === -1)) {
|
|
51
|
-
throw new Error(`Error when trying to map ranges. Escaped string was: '${input}. [${[...input].join('|')}]'`);
|
|
52
|
-
}
|
|
53
|
-
};
|
|
54
|
-
let preIndex = copy.indexOf(FuzzySearch_1.PRE);
|
|
55
|
-
let postIndex = copy.indexOf(FuzzySearch_1.POST);
|
|
56
|
-
validate(preIndex, postIndex);
|
|
57
|
-
while (preIndex !== -1 && postIndex !== -1) {
|
|
58
|
-
ranges.push({
|
|
59
|
-
offset: preIndex,
|
|
60
|
-
length: postIndex - preIndex - 1
|
|
61
|
-
});
|
|
62
|
-
copy.splice(postIndex, 1);
|
|
63
|
-
copy.splice(preIndex, 1);
|
|
64
|
-
preIndex = copy.indexOf(FuzzySearch_1.PRE);
|
|
65
|
-
postIndex = copy.indexOf(FuzzySearch_1.POST);
|
|
66
|
-
}
|
|
67
|
-
if (ranges.length === 0) {
|
|
68
|
-
throw new Error(`Unexpected zero ranges for match-string: ${input}.`);
|
|
69
|
-
}
|
|
70
|
-
return ranges;
|
|
71
|
-
}
|
|
72
|
-
};
|
|
73
|
-
exports.FuzzySearch = FuzzySearch;
|
|
74
|
-
exports.FuzzySearch = FuzzySearch = FuzzySearch_1 = tslib_1.__decorate([
|
|
75
|
-
(0, inversify_1.injectable)()
|
|
76
|
-
], FuzzySearch);
|
|
19
|
+
// Re-export from common location for backward compatibility.
|
|
20
|
+
var fuzzy_search_1 = require("../../common/fuzzy-search");
|
|
21
|
+
Object.defineProperty(exports, "FuzzySearch", { enumerable: true, get: function () { return fuzzy_search_1.FuzzySearch; } });
|
|
77
22
|
//# sourceMappingURL=fuzzy-search.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fuzzy-search.js","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.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
|
|
1
|
+
{"version":3,"file":"fuzzy-search.js","sourceRoot":"","sources":["../../../src/browser/tree/fuzzy-search.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,6DAA6D;AAC7D,0DAAwD;AAA/C,2GAAA,WAAW,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-view-welcome-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/tree-view-welcome-widget.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tree-view-welcome-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/tree-view-welcome-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,7 @@ let TreeViewWelcomeWidget = class TreeViewWelcomeWidget extends tree_widget_1.Tr
|
|
|
43
43
|
this.openLinkOrCommand = (event, value) => {
|
|
44
44
|
event.stopPropagation();
|
|
45
45
|
if (value.startsWith('command:')) {
|
|
46
|
-
|
|
47
|
-
this.commands.executeCommand(command);
|
|
46
|
+
(0, opener_service_1.open)(this.openerService, new uri_1.default(value));
|
|
48
47
|
}
|
|
49
48
|
else if (value.startsWith('file:')) {
|
|
50
49
|
const uri = value.replace('file:', '');
|