@theia/editor 1.54.0 → 1.55.0-next.25

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.
@@ -1,13 +1,13 @@
1
1
  import { EditorManager } from './editor-manager';
2
2
  import { TextEditor } from './editor';
3
3
  import { StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
4
- import { FrontendApplicationContribution, QuickInputService, KeybindingRegistry, KeybindingContribution, ApplicationShell } from '@theia/core/lib/browser';
4
+ import { FrontendApplicationContribution, QuickInputService, KeybindingRegistry, KeybindingContribution, ApplicationShell, WidgetStatusBarContribution, Widget } from '@theia/core/lib/browser';
5
5
  import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
6
6
  import { DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
7
7
  import { CommandRegistry, CommandContribution } from '@theia/core/lib/common';
8
+ import { EditorWidget } from './editor-widget';
8
9
  import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
9
- export declare class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
10
- protected readonly statusBar: StatusBar;
10
+ export declare class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution, WidgetStatusBarContribution<EditorWidget> {
11
11
  protected readonly editorManager: EditorManager;
12
12
  protected readonly languageStatusService: EditorLanguageStatusService;
13
13
  protected readonly shell: ApplicationShell;
@@ -16,10 +16,12 @@ export declare class EditorContribution implements FrontendApplicationContributi
16
16
  onStart(): void;
17
17
  protected initEditorContextKeys(): void;
18
18
  protected readonly toDisposeOnCurrentEditorChanged: DisposableCollection;
19
- protected updateStatusBar(): void;
20
- protected updateLanguageStatus(editor: TextEditor | undefined): void;
21
- protected updateEncodingStatus(editor: TextEditor | undefined): void;
22
- protected setCursorPositionStatus(editor: TextEditor | undefined): void;
19
+ canHandle(widget: Widget): widget is EditorWidget;
20
+ activate(statusBar: StatusBar, widget: EditorWidget): void;
21
+ deactivate(statusBar: StatusBar): void;
22
+ protected updateLanguageStatus(statusBar: StatusBar, editor: TextEditor | undefined): void;
23
+ protected updateEncodingStatus(statusBar: StatusBar, editor: TextEditor | undefined): void;
24
+ protected setCursorPositionStatus(statusBar: StatusBar, editor: TextEditor | undefined): void;
23
25
  registerCommands(commands: CommandRegistry): void;
24
26
  registerKeybindings(keybindings: KeybindingRegistry): void;
25
27
  registerMenus(registry: MenuModelRegistry): void;
@@ -1 +1 @@
1
- {"version":3,"file":"editor-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/editor-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAsB,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EACH,+BAA+B,EAC/B,iBAAiB,EAAE,kBAAkB,EAAE,sBAAsB,EAA8B,gBAAgB,EAC9G,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAkB,oBAAoB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAExG,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAK9E,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAE/F,qBACa,kBAAmB,YAAW,+BAA+B,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB;IAElH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACpC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;IACjF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,OAAO,IAAI,IAAI;IAOf,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAkBvC,SAAS,CAAC,QAAQ,CAAC,+BAA+B,uBAA8B;IAChF,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBjC,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAIpE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAcpE,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAevE,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAuBjD,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAe1D,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CAsBnD"}
1
+ {"version":3,"file":"editor-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/editor-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAsB,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EACH,+BAA+B,EAC/B,iBAAiB,EAAE,kBAAkB,EAAE,sBAAsB,EAA8B,gBAAgB,EAC3G,2BAA2B,EAC3B,MAAM,EACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAkB,oBAAoB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAExG,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAE/F,qBACa,kBAAmB,YAAW,+BAA+B,EACtE,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,2BAA2B,CAAC,YAAY,CAAC;IAEjF,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;IACjF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAkBvC,SAAS,CAAC,QAAQ,CAAC,+BAA+B,uBAA8B;IAEhF,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,YAAY;IAIjD,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI;IAa1D,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAOtC,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAI1F,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAc1F,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI;IAe7F,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAuBjD,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAe1D,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CAsBnD"}
@@ -35,8 +35,6 @@ let EditorContribution = class EditorContribution {
35
35
  }
36
36
  onStart() {
37
37
  this.initEditorContextKeys();
38
- this.updateStatusBar();
39
- this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
40
38
  }
41
39
  initEditorContextKeys() {
42
40
  const editorIsOpen = this.contextKeyService.createKey('editorIsOpen', false);
@@ -55,30 +53,36 @@ let EditorContribution = class EditorContribution {
55
53
  widget.disposed.connect(updateContextKeys);
56
54
  });
57
55
  }
58
- updateStatusBar() {
56
+ canHandle(widget) {
57
+ return widget instanceof editor_widget_1.EditorWidget;
58
+ }
59
+ activate(statusBar, widget) {
59
60
  this.toDisposeOnCurrentEditorChanged.dispose();
60
- const widget = this.editorManager.currentEditor;
61
- const editor = widget && widget.editor;
62
- this.updateLanguageStatus(editor);
63
- this.updateEncodingStatus(editor);
64
- this.setCursorPositionStatus(editor);
65
- if (editor) {
66
- this.toDisposeOnCurrentEditorChanged.pushAll([
67
- editor.onLanguageChanged(() => this.updateLanguageStatus(editor)),
68
- editor.onEncodingChanged(() => this.updateEncodingStatus(editor)),
69
- editor.onCursorPositionChanged(() => this.setCursorPositionStatus(editor))
70
- ]);
71
- }
61
+ const editor = widget.editor;
62
+ this.updateLanguageStatus(statusBar, editor);
63
+ this.updateEncodingStatus(statusBar, editor);
64
+ this.setCursorPositionStatus(statusBar, editor);
65
+ this.toDisposeOnCurrentEditorChanged.pushAll([
66
+ editor.onLanguageChanged(() => this.updateLanguageStatus(statusBar, editor)),
67
+ editor.onEncodingChanged(() => this.updateEncodingStatus(statusBar, editor)),
68
+ editor.onCursorPositionChanged(() => this.setCursorPositionStatus(statusBar, editor))
69
+ ]);
70
+ }
71
+ deactivate(statusBar) {
72
+ this.toDisposeOnCurrentEditorChanged.dispose();
73
+ this.updateLanguageStatus(statusBar, undefined);
74
+ this.updateEncodingStatus(statusBar, undefined);
75
+ this.setCursorPositionStatus(statusBar, undefined);
72
76
  }
73
- updateLanguageStatus(editor) {
77
+ updateLanguageStatus(statusBar, editor) {
74
78
  this.languageStatusService.updateLanguageStatus(editor);
75
79
  }
76
- updateEncodingStatus(editor) {
80
+ updateEncodingStatus(statusBar, editor) {
77
81
  if (!editor) {
78
- this.statusBar.removeElement('editor-status-encoding');
82
+ statusBar.removeElement('editor-status-encoding');
79
83
  return;
80
84
  }
81
- this.statusBar.setElement('editor-status-encoding', {
85
+ statusBar.setElement('editor-status-encoding', {
82
86
  text: supported_encodings_1.SUPPORTED_ENCODINGS[editor.getEncoding()].labelShort,
83
87
  alignment: status_bar_1.StatusBarAlignment.RIGHT,
84
88
  priority: 10,
@@ -86,13 +90,13 @@ let EditorContribution = class EditorContribution {
86
90
  tooltip: nls_1.nls.localizeByDefault('Select Encoding')
87
91
  });
88
92
  }
89
- setCursorPositionStatus(editor) {
93
+ setCursorPositionStatus(statusBar, editor) {
90
94
  if (!editor) {
91
- this.statusBar.removeElement('editor-status-cursor-position');
95
+ statusBar.removeElement('editor-status-cursor-position');
92
96
  return;
93
97
  }
94
98
  const { cursor } = editor;
95
- this.statusBar.setElement('editor-status-cursor-position', {
99
+ statusBar.setElement('editor-status-cursor-position', {
96
100
  text: nls_1.nls.localizeByDefault('Ln {0}, Col {1}', cursor.line + 1, editor.getVisibleColumn(cursor)),
97
101
  alignment: status_bar_1.StatusBarAlignment.RIGHT,
98
102
  priority: 100,
@@ -160,10 +164,6 @@ let EditorContribution = class EditorContribution {
160
164
  }
161
165
  };
162
166
  exports.EditorContribution = EditorContribution;
163
- tslib_1.__decorate([
164
- (0, inversify_1.inject)(status_bar_1.StatusBar),
165
- tslib_1.__metadata("design:type", Object)
166
- ], EditorContribution.prototype, "statusBar", void 0);
167
167
  tslib_1.__decorate([
168
168
  (0, inversify_1.inject)(editor_manager_1.EditorManager),
169
169
  tslib_1.__metadata("design:type", editor_manager_1.EditorManager)
@@ -1 +1 @@
1
- {"version":3,"file":"editor-contribution.js","sourceRoot":"","sources":["../../src/browser/editor-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor-contribution.js","sourceRoot":"","sources":["../../src/browser/editor-contribution.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"editor-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/editor-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,8DAA8D,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAuB/D,wBA+CG"}
1
+ {"version":3,"file":"editor-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/editor-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,8DAA8D,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAuB/D,wBAoDG"}
@@ -52,7 +52,6 @@ exports.default = new inversify_1.ContainerModule(bind => {
52
52
  bind(editor_keybinding_1.EditorKeybindingContribution).toSelf().inSingletonScope();
53
53
  bind(browser_1.KeybindingContribution).toService(editor_keybinding_1.EditorKeybindingContribution);
54
54
  bind(editor_contribution_1.EditorContribution).toSelf().inSingletonScope();
55
- bind(browser_1.FrontendApplicationContribution).toService(editor_contribution_1.EditorContribution);
56
55
  bind(editor_language_status_service_1.EditorLanguageStatusService).toSelf().inSingletonScope();
57
56
  bind(editor_linenumber_contribution_1.EditorLineNumberContribution).toSelf().inSingletonScope();
58
57
  bind(browser_1.FrontendApplicationContribution).toService(editor_linenumber_contribution_1.EditorLineNumberContribution);
@@ -62,7 +61,13 @@ exports.default = new inversify_1.ContainerModule(bind => {
62
61
  bind(navigation_location_updater_1.NavigationLocationUpdater).toSelf().inSingletonScope();
63
62
  bind(navigation_location_similarity_1.NavigationLocationSimilarity).toSelf().inSingletonScope();
64
63
  bind(browser_2.VariableContribution).to(editor_variable_contribution_1.EditorVariableContribution).inSingletonScope();
65
- [common_1.CommandContribution, browser_1.KeybindingContribution, common_1.MenuContribution].forEach(serviceIdentifier => {
64
+ [
65
+ browser_1.FrontendApplicationContribution,
66
+ browser_1.WidgetStatusBarContribution,
67
+ common_1.CommandContribution,
68
+ browser_1.KeybindingContribution,
69
+ common_1.MenuContribution
70
+ ].forEach(serviceIdentifier => {
66
71
  bind(serviceIdentifier).toService(editor_contribution_1.EditorContribution);
67
72
  });
68
73
  bind(quick_editor_service_1.QuickEditorService).toSelf().inSingletonScope();
@@ -1 +1 @@
1
- {"version":3,"file":"editor-frontend-module.js","sourceRoot":"","sources":["../../src/browser/editor-frontend-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor-frontend-module.js","sourceRoot":"","sources":["../../src/browser/editor-frontend-module.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@theia/editor",
3
- "version": "1.54.0",
3
+ "version": "1.55.0-next.25+2be612f8a",
4
4
  "description": "Theia - Editor Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.54.0",
7
- "@theia/variable-resolver": "1.54.0",
6
+ "@theia/core": "1.55.0-next.25+2be612f8a",
7
+ "@theia/variable-resolver": "1.55.0-next.25+2be612f8a",
8
8
  "tslib": "^2.6.2"
9
9
  },
10
10
  "publishConfig": {
@@ -46,5 +46,5 @@
46
46
  "nyc": {
47
47
  "extends": "../../configs/nyc.json"
48
48
  },
49
- "gitHead": "8fb36a237db744cff6e78eaff1481e1f36bb7a69"
49
+ "gitHead": "2be612f8a7efb90c1183ba47f0897040925b304a"
50
50
  }
@@ -20,7 +20,9 @@ import { injectable, inject, optional } from '@theia/core/shared/inversify';
20
20
  import { StatusBarAlignment, StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
21
21
  import {
22
22
  FrontendApplicationContribution, DiffUris, DockLayout,
23
- QuickInputService, KeybindingRegistry, KeybindingContribution, SHELL_TABBAR_CONTEXT_SPLIT, ApplicationShell
23
+ QuickInputService, KeybindingRegistry, KeybindingContribution, SHELL_TABBAR_CONTEXT_SPLIT, ApplicationShell,
24
+ WidgetStatusBarContribution,
25
+ Widget
24
26
  } from '@theia/core/lib/browser';
25
27
  import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
26
28
  import { CommandHandler, DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
@@ -33,9 +35,9 @@ import { EditorWidget } from './editor-widget';
33
35
  import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
34
36
 
35
37
  @injectable()
36
- export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
38
+ export class EditorContribution implements FrontendApplicationContribution,
39
+ CommandContribution, KeybindingContribution, MenuContribution, WidgetStatusBarContribution<EditorWidget> {
37
40
 
38
- @inject(StatusBar) protected readonly statusBar: StatusBar;
39
41
  @inject(EditorManager) protected readonly editorManager: EditorManager;
40
42
  @inject(EditorLanguageStatusService) protected readonly languageStatusService: EditorLanguageStatusService;
41
43
  @inject(ApplicationShell) protected readonly shell: ApplicationShell;
@@ -48,9 +50,6 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
48
50
 
49
51
  onStart(): void {
50
52
  this.initEditorContextKeys();
51
-
52
- this.updateStatusBar();
53
- this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
54
53
  }
55
54
 
56
55
  protected initEditorContextKeys(): void {
@@ -72,33 +71,41 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
72
71
  }
73
72
 
74
73
  protected readonly toDisposeOnCurrentEditorChanged = new DisposableCollection();
75
- protected updateStatusBar(): void {
74
+
75
+ canHandle(widget: Widget): widget is EditorWidget {
76
+ return widget instanceof EditorWidget;
77
+ }
78
+
79
+ activate(statusBar: StatusBar, widget: EditorWidget): void {
76
80
  this.toDisposeOnCurrentEditorChanged.dispose();
81
+ const editor = widget.editor;
82
+ this.updateLanguageStatus(statusBar, editor);
83
+ this.updateEncodingStatus(statusBar, editor);
84
+ this.setCursorPositionStatus(statusBar, editor);
85
+ this.toDisposeOnCurrentEditorChanged.pushAll([
86
+ editor.onLanguageChanged(() => this.updateLanguageStatus(statusBar, editor)),
87
+ editor.onEncodingChanged(() => this.updateEncodingStatus(statusBar, editor)),
88
+ editor.onCursorPositionChanged(() => this.setCursorPositionStatus(statusBar, editor))
89
+ ]);
90
+ }
77
91
 
78
- const widget = this.editorManager.currentEditor;
79
- const editor = widget && widget.editor;
80
- this.updateLanguageStatus(editor);
81
- this.updateEncodingStatus(editor);
82
- this.setCursorPositionStatus(editor);
83
- if (editor) {
84
- this.toDisposeOnCurrentEditorChanged.pushAll([
85
- editor.onLanguageChanged(() => this.updateLanguageStatus(editor)),
86
- editor.onEncodingChanged(() => this.updateEncodingStatus(editor)),
87
- editor.onCursorPositionChanged(() => this.setCursorPositionStatus(editor))
88
- ]);
89
- }
92
+ deactivate(statusBar: StatusBar): void {
93
+ this.toDisposeOnCurrentEditorChanged.dispose();
94
+ this.updateLanguageStatus(statusBar, undefined);
95
+ this.updateEncodingStatus(statusBar, undefined);
96
+ this.setCursorPositionStatus(statusBar, undefined);
90
97
  }
91
98
 
92
- protected updateLanguageStatus(editor: TextEditor | undefined): void {
99
+ protected updateLanguageStatus(statusBar: StatusBar, editor: TextEditor | undefined): void {
93
100
  this.languageStatusService.updateLanguageStatus(editor);
94
101
  }
95
102
 
96
- protected updateEncodingStatus(editor: TextEditor | undefined): void {
103
+ protected updateEncodingStatus(statusBar: StatusBar, editor: TextEditor | undefined): void {
97
104
  if (!editor) {
98
- this.statusBar.removeElement('editor-status-encoding');
105
+ statusBar.removeElement('editor-status-encoding');
99
106
  return;
100
107
  }
101
- this.statusBar.setElement('editor-status-encoding', {
108
+ statusBar.setElement('editor-status-encoding', {
102
109
  text: SUPPORTED_ENCODINGS[editor.getEncoding()].labelShort,
103
110
  alignment: StatusBarAlignment.RIGHT,
104
111
  priority: 10,
@@ -107,13 +114,13 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
107
114
  });
108
115
  }
109
116
 
110
- protected setCursorPositionStatus(editor: TextEditor | undefined): void {
117
+ protected setCursorPositionStatus(statusBar: StatusBar, editor: TextEditor | undefined): void {
111
118
  if (!editor) {
112
- this.statusBar.removeElement('editor-status-cursor-position');
119
+ statusBar.removeElement('editor-status-cursor-position');
113
120
  return;
114
121
  }
115
122
  const { cursor } = editor;
116
- this.statusBar.setElement('editor-status-cursor-position', {
123
+ statusBar.setElement('editor-status-cursor-position', {
117
124
  text: nls.localizeByDefault('Ln {0}, Col {1}', cursor.line + 1, editor.getVisibleColumn(cursor)),
118
125
  alignment: StatusBarAlignment.RIGHT,
119
126
  priority: 100,
@@ -19,7 +19,7 @@ import '../../src/browser/language-status/editor-language-status.css';
19
19
 
20
20
  import { ContainerModule } from '@theia/core/shared/inversify';
21
21
  import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
22
- import { OpenHandler, WidgetFactory, FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
22
+ import { OpenHandler, WidgetFactory, FrontendApplicationContribution, KeybindingContribution, WidgetStatusBarContribution } from '@theia/core/lib/browser';
23
23
  import { VariableContribution } from '@theia/variable-resolver/lib/browser';
24
24
  import { EditorManager, EditorAccess, ActiveEditorAccess, CurrentEditorAccess } from './editor-manager';
25
25
  import { EditorContribution } from './editor-contribution';
@@ -59,7 +59,6 @@ export default new ContainerModule(bind => {
59
59
  bind(KeybindingContribution).toService(EditorKeybindingContribution);
60
60
 
61
61
  bind(EditorContribution).toSelf().inSingletonScope();
62
- bind(FrontendApplicationContribution).toService(EditorContribution);
63
62
  bind(EditorLanguageStatusService).toSelf().inSingletonScope();
64
63
 
65
64
  bind(EditorLineNumberContribution).toSelf().inSingletonScope();
@@ -73,7 +72,13 @@ export default new ContainerModule(bind => {
73
72
 
74
73
  bind(VariableContribution).to(EditorVariableContribution).inSingletonScope();
75
74
 
76
- [CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier => {
75
+ [
76
+ FrontendApplicationContribution,
77
+ WidgetStatusBarContribution,
78
+ CommandContribution,
79
+ KeybindingContribution,
80
+ MenuContribution
81
+ ].forEach(serviceIdentifier => {
77
82
  bind(serviceIdentifier).toService(EditorContribution);
78
83
  });
79
84
  bind(QuickEditorService).toSelf().inSingletonScope();