Skip to content

Commit 544f1ca

Browse files
authored
Merge pull request microsoft#166486 from microsoft/joh/yielding-marten
don't use any-cast to access private or protected members
2 parents e6a5055 + 76cdb40 commit 544f1ca

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/vs/base/browser/ui/tree/abstractTree.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ class TreeNodeListMouseController<T, TFilterData, TRef> extends MouseController<
12521252
}
12531253

12541254
if (node.collapsible) {
1255-
const model = ((this.tree as any).model as ITreeModel<T, TFilterData, TRef>); // internal
1255+
const model = this.tree.model; // internal
12561256
const location = model.getNodeLocation(node);
12571257
const recursive = e.browserEvent.altKey;
12581258
this.tree.setFocus([location]);
@@ -1375,7 +1375,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
13751375

13761376
protected view: TreeNodeList<T, TFilterData, TRef>;
13771377
private renderers: TreeRenderer<T, TFilterData, TRef, any>[];
1378-
protected model: ITreeModel<T, TFilterData, TRef>;
1378+
model: ITreeModel<T, TFilterData, TRef>; // used in MouseController
13791379
private focus: Trait<T>;
13801380
private selection: Trait<T>;
13811381
private anchor: Trait<T>;

src/vs/base/browser/ui/tree/dataTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface IDataTreeOptions<T, TFilterData = void> extends IAbstractTreeOp
1616

1717
export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
1818

19-
protected declare model: ObjectTreeModel<T, TFilterData>;
19+
declare model: ObjectTreeModel<T, TFilterData>;
2020
private input: TInput | undefined;
2121

2222
private identityProvider: IIdentityProvider<T> | undefined;

src/vs/base/browser/ui/tree/indexTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface IIndexTreeOptions<T, TFilterData = void> extends IAbstractTreeO
1414

1515
export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterData, number[]> {
1616

17-
protected declare model: IndexTreeModel<T, TFilterData>;
17+
declare model: IndexTreeModel<T, TFilterData>;
1818

1919
constructor(
2020
user: string,

src/vs/base/browser/ui/tree/objectTree.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export interface IObjectTreeViewState {
4545

4646
export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
4747

48-
protected declare model: IObjectTreeModel<T, TFilterData>;
48+
declare model: IObjectTreeModel<T, TFilterData>;
4949

5050
override get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<T | null, TFilterData>> { return this.model.onDidChangeCollapseState; }
5151

@@ -197,7 +197,7 @@ export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptio
197197

198198
export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = void> extends ObjectTree<T, TFilterData> implements ICompressedTreeNodeProvider<T, TFilterData> {
199199

200-
protected declare model: CompressibleObjectTreeModel<T, TFilterData>;
200+
declare model: CompressibleObjectTreeModel<T, TFilterData>;
201201

202202
constructor(
203203
user: string,

0 commit comments

Comments
 (0)