-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Provide API to filter unwanted contributions
Adds the ContributionFilterRegistry which can be used to filter contributions of Theia extensions before they are bound. This mechanism can be used by application developers to specifically filter individual contributions from Theia extensions they have no control over, i.e. core or 3rd party extensions. Resolves #9069 Contributed on behalf of STMicroelectronics Signed-off-by: Tobias Ortmayr <tortmayr@eclipsesource.com>
- Loading branch information
Showing
13 changed files
with
394 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
examples/api-samples/src/browser/contribution-filter/sample-filtered-command-contribution.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
| import { Command, CommandContribution, CommandRegistry, ContributionFilter, equals, NameBasedContributionFilter } from '@theia/core/lib/common'; | ||
| import { injectable, interfaces } from '@theia/core/shared/inversify'; | ||
| export namespace SampleFilteredCommand { | ||
| const EXAMPLE_CATEGORY = 'Examples'; | ||
| export const FILTERED: Command = { | ||
| id: 'example_command.filtered', | ||
| category: EXAMPLE_CATEGORY, | ||
| label: 'This command should be filtered out' | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * This sample command is used to test the runtime filtering of already bound contributions. | ||
| */ | ||
| @injectable() | ||
| export class SampleFilteredCommandContribution implements CommandContribution { | ||
|
|
||
| registerCommands(commands: CommandRegistry): void { | ||
| commands.registerCommand(SampleFilteredCommand.FILTERED, { execute: () => { } }); | ||
| } | ||
| } | ||
|
|
||
| @injectable() | ||
| export class SampleFilteredCommandContributionFilter extends NameBasedContributionFilter { | ||
|
|
||
| contributions = [CommandContribution]; | ||
| doTest(toTest: string): boolean { | ||
| return equals(toTest, false, 'SampleFilteredCommandContribution'); | ||
| } | ||
| } | ||
|
|
||
| export const bindSampleFilteredCommandContribution = (bind: interfaces.Bind) => { | ||
| bind(CommandContribution).to(SampleFilteredCommandContribution); | ||
| bind(ContributionFilter).to(SampleFilteredCommandContributionFilter); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| // @ts-check | ||
| describe('Contribution filter', function () { | ||
| this.timeout(5000); | ||
| const { assert } = chai; | ||
|
|
||
| const { CommandRegistry, CommandContribution } = require('@theia/core/lib/common/command'); | ||
| const { SampleFilteredCommandContribution, SampleFilteredCommand } = require('@theia/api-samples/lib/browser/contribution-filter/sample-filtered-command-contribution'); | ||
|
|
||
| const container = window.theia.container; | ||
| const commands = container.get(CommandRegistry); | ||
|
|
||
| it('filtered command in container but not in registry', async function () { | ||
| const allCommands = container.getAll(CommandContribution); | ||
| assert.isDefined(allCommands.find(contribution => contribution instanceof SampleFilteredCommandContribution), | ||
| 'SampleFilteredCommandContribution is not bound in container'); | ||
| const filteredCommand = commands.getCommand(SampleFilteredCommand.FILTERED.id); | ||
| assert.isUndefined(filteredCommand, 'SampleFilteredCommandContribution should be filtered out but is present in "CommandRegistry"'); | ||
| }); | ||
|
|
||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
packages/core/src/common/contribution-filter/contribution-filter-registry.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| import { injectable, multiInject, optional } from 'inversify'; | ||
| import { ContributionFilter, ContributionType } from './contribution-filter'; | ||
| import { applyFilters } from './filter'; | ||
|
|
||
| const GENERIC_CONTRIBUTION_FILTER_KEY = '*'; | ||
| @injectable() | ||
| export class ContributionFilterRegistry { | ||
| registry: Map<ContributionType, ContributionFilter[]>; | ||
| constructor(@multiInject(ContributionFilter) @optional() contributionFilters: ContributionFilter[] = []) { | ||
| this.registry = new Map(); | ||
| contributionFilters.forEach(filter => { | ||
| if (!filter.contributions || filter.contributions.length === 0) { | ||
| this.addFilter(GENERIC_CONTRIBUTION_FILTER_KEY, filter); | ||
| } else { | ||
| filter.contributions.forEach(type => { | ||
| this.addFilter(type, filter); | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private addFilter(type: ContributionType, filter: ContributionFilter): void { | ||
| this.getOrCreate(type).push(filter); | ||
| } | ||
|
|
||
| private getOrCreate(type: ContributionType): ContributionFilter[] { | ||
| let value = this.registry.get(type); | ||
| if (!value) { | ||
| value = []; | ||
| this.registry.set(type, value); | ||
| } | ||
| return value; | ||
| } | ||
|
|
||
| get(type: ContributionType): ContributionFilter[] { | ||
| const filters = [...(this.registry.get(type) || [])]; | ||
| if (type !== GENERIC_CONTRIBUTION_FILTER_KEY) { | ||
| filters.push(...(this.registry.get(GENERIC_CONTRIBUTION_FILTER_KEY) || [])); | ||
| } | ||
| return filters; | ||
| } | ||
|
|
||
| /** | ||
| * Applies the filters for the given contribution type. Generic filters will be applied on any given type. | ||
| * @param toFilter the elements to filter | ||
| * @param type the contribution type for which potentially filters were registered | ||
| * @returns the filtered elements | ||
| */ | ||
| applyFilters<T extends Object>(toFilter: T[], type: ContributionType): T[] { | ||
| const filters = this.get(type); | ||
| return applyFilters<T>(toFilter, filters); | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
packages/core/src/common/contribution-filter/contribution-filter.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| import { interfaces } from 'inversify'; | ||
| import { Filter } from './filter'; | ||
| import { NameBasedFilter } from './string-based-filter'; | ||
| export type ContributionType = interfaces.ServiceIdentifier<unknown>; | ||
|
|
||
| export const ContributionFilter = Symbol('ContributionFilter'); | ||
|
|
||
| /** | ||
| * Specialized `Filter` that is used by the `ContainerBasedContributionProvider` to | ||
| * filter unwanted contributions that are already bound in the DI container. | ||
| */ | ||
| export interface ContributionFilter extends Filter<Object> { | ||
| /** | ||
| * Contribution types for which this filter is applicable. If `undefined` or empty this filter | ||
| * will be applied to all contribution types. | ||
| */ | ||
| contributions?: ContributionType[]; | ||
| } | ||
|
|
||
| /** | ||
| * Specialized `ContributionFilter` that can be used to filter contributions based on their constructor name. | ||
| */ | ||
| export abstract class NameBasedContributionFilter extends NameBasedFilter<Object> implements ContributionFilter { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| export const Filter = Symbol('Filter'); | ||
| /** | ||
| * A `Filter` can be used to test whether a given object should be filtered | ||
| * from a set of objects. The `test` function can be applied to an object | ||
| * of matching type and returns `true` if the object should be filtered out. | ||
| */ | ||
| export interface Filter<T extends Object> { | ||
| /** | ||
| * Evaluates this filter on the given argument. | ||
| * @param toTest Object that should be tested | ||
| * @returns `true` if the object should be filtered out, `false` otherwise | ||
| */ | ||
| test(toTest: T): Boolean; | ||
| } | ||
|
|
||
| /** | ||
| * Applies a set of filters to a set of given objects and returns the set of filtered objects. | ||
| * @param toFilter Set of objects which should be filtered | ||
| * @param filters Set of filters that should be applied | ||
| * @param negate Negation flag. If set to true the result of all `Filter.test` methods is negated | ||
| * @returns The set of filtered arguments | ||
| */ | ||
| export function applyFilters<T extends Object>(toFilter: T[], filters: Filter<T>[], negate: boolean = false): T[] { | ||
| if (filters.length === 0) { | ||
| return toFilter; | ||
| } | ||
| return toFilter.filter(object => { | ||
| const result = filters.every(filter => !filter.test(object)); | ||
| return negate ? !result : result; | ||
| }); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2021 STMicroelectronics and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| export * from './contribution-filter'; | ||
| export * from './contribution-filter-registry'; | ||
| export * from './filter'; | ||
| export * from './string-based-filter'; |
Oops, something went wrong.