Skip to content

Commit efb4fd9

Browse files
authored
spell out EditorContributionInstantiation-type when registering some contributions (microsoft#167034)
microsoft#166969
1 parent 58e7c7b commit efb4fd9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/vs/editor/contrib/suggest/browser/suggestController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { StopWatch } from 'vs/base/common/stopwatch';
1717
import { assertType, isObject } from 'vs/base/common/types';
1818
import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
1919
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
20-
import { EditorAction, EditorCommand, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
20+
import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
2121
import { EditorOption } from 'vs/editor/common/config/editorOptions';
2222
import { EditOperation } from 'vs/editor/common/core/editOperation';
2323
import { IPosition, Position } from 'vs/editor/common/core/position';
@@ -726,7 +726,7 @@ export class TriggerSuggestAction extends EditorAction {
726726
}
727727
}
728728

729-
registerEditorContribution(SuggestController.ID, SuggestController);
729+
registerEditorContribution(SuggestController.ID, SuggestController, EditorContributionInstantiation.Eager); // eager because it needs to listen to editor typing event
730730
registerEditorAction(TriggerSuggestAction);
731731

732732
const weight = KeybindingWeight.EditorContrib + 90;

src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { FuzzyScore } from 'vs/base/common/filters';
88
import { Iterable } from 'vs/base/common/iterator';
99
import { IDisposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
1010
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
11-
import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
11+
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
1212
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1313
import { EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
1414
import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
@@ -259,4 +259,4 @@ class EditorContribution implements IEditorContribution {
259259
}
260260
}
261261

262-
registerEditorContribution('suggest.inlineCompletionsProvider', EditorContribution);
262+
registerEditorContribution('suggest.inlineCompletionsProvider', EditorContribution, EditorContributionInstantiation.Eager); // eager because the contribution is used as a way to ONCE access a service to which a provider is registered

src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { CancellationTokenSource } from 'vs/base/common/cancellation';
99
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
1010
import { CallHierarchyTreePeekWidget } from 'vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek';
1111
import { Event } from 'vs/base/common/event';
12-
import { registerEditorContribution, EditorAction2 } from 'vs/editor/browser/editorExtensions';
12+
import { registerEditorContribution, EditorAction2, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
1313
import { IEditorContribution } from 'vs/editor/common/editorCommon';
1414
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
1515
import { IContextKeyService, RawContextKey, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -172,7 +172,7 @@ class CallHierarchyController implements IEditorContribution {
172172
}
173173
}
174174

175-
registerEditorContribution(CallHierarchyController.Id, CallHierarchyController);
175+
registerEditorContribution(CallHierarchyController.Id, CallHierarchyController, EditorContributionInstantiation.Eager); // eager because it needs to define a context key
176176

177177
registerAction2(class extends EditorAction2 {
178178

src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Event } from 'vs/base/common/event';
1010
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
1111
import { DisposableStore } from 'vs/base/common/lifecycle';
1212
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
13-
import { EditorAction2, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
13+
import { EditorAction2, EditorContributionInstantiation, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
1414
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1515
import { Position } from 'vs/editor/common/core/position';
1616
import { Range } from 'vs/editor/common/core/range';
@@ -169,7 +169,7 @@ class TypeHierarchyController implements IEditorContribution {
169169
}
170170
}
171171

172-
registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController);
172+
registerEditorContribution(TypeHierarchyController.Id, TypeHierarchyController, EditorContributionInstantiation.Eager); // eager because it needs to define a context key
173173

174174
// Peek
175175
registerAction2(class extends EditorAction2 {

0 commit comments

Comments
 (0)