@theia/toolbar 1.45.1 → 1.46.0-next.72

package/src/browser/toolbar-interfaces.ts

@@ -1,76 +1,76 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { interfaces } from '@theia/core/shared/inversify';
-import { ReactTabBarToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-
-export enum ToolbarAlignment {
-    LEFT = 'left',
-    CENTER = 'center',
-    RIGHT = 'right'
-}
-
-export interface ToolbarTreeSchema {
-    items: {
-        [key in ToolbarAlignment]: ToolbarItem[][];
-    };
-}
-
-export interface DeflatedToolbarTree {
-    items: {
-        [key in ToolbarAlignment]: ToolbarItemDeflated[][];
-    };
-}
-export namespace ToolbarAlignmentString {
-    export const is = (obj: unknown): obj is ToolbarAlignment => obj === ToolbarAlignment.LEFT
-        || obj === ToolbarAlignment.CENTER
-        || obj === ToolbarAlignment.RIGHT;
-}
-
-export interface ToolbarContributionProperties {
-    toJSON(): DeflatedContributedToolbarItem;
-}
-
-export type ToolbarContribution = ReactTabBarToolbarItem & ToolbarContributionProperties;
-
-export const ToolbarContribution = Symbol('ToolbarContribution');
-
-export const Toolbar = Symbol('Toolbar');
-export const ToolbarFactory = Symbol('ToolbarFactory');
-export type Toolbar = TabBarToolbar;
-
-export type ToolbarItem = ToolbarContribution | TabBarToolbarItem;
-export interface DeflatedContributedToolbarItem { id: string; group: 'contributed' };
-export type ToolbarItemDeflated = DeflatedContributedToolbarItem | TabBarToolbarItem;
-
-export const LateInjector = Symbol('LateInjector');
-
-export const lateInjector = <T>(
-    context: interfaces.Container,
-    serviceIdentifier: interfaces.ServiceIdentifier<T>,
-): T => context.get<T>(serviceIdentifier);
-
-export interface ToolbarItemPosition {
-    alignment: ToolbarAlignment;
-    groupIndex: number;
-    itemIndex: number;
-}
-
-export enum IconSet {
-    FA = 'fa',
-    CODICON = 'codicon'
-}
-
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { interfaces } from '@theia/core/shared/inversify';
+import { ReactTabBarToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+
+export enum ToolbarAlignment {
+    LEFT = 'left',
+    CENTER = 'center',
+    RIGHT = 'right'
+}
+
+export interface ToolbarTreeSchema {
+    items: {
+        [key in ToolbarAlignment]: ToolbarItem[][];
+    };
+}
+
+export interface DeflatedToolbarTree {
+    items: {
+        [key in ToolbarAlignment]: ToolbarItemDeflated[][];
+    };
+}
+export namespace ToolbarAlignmentString {
+    export const is = (obj: unknown): obj is ToolbarAlignment => obj === ToolbarAlignment.LEFT
+        || obj === ToolbarAlignment.CENTER
+        || obj === ToolbarAlignment.RIGHT;
+}
+
+export interface ToolbarContributionProperties {
+    toJSON(): DeflatedContributedToolbarItem;
+}
+
+export type ToolbarContribution = ReactTabBarToolbarItem & ToolbarContributionProperties;
+
+export const ToolbarContribution = Symbol('ToolbarContribution');
+
+export const Toolbar = Symbol('Toolbar');
+export const ToolbarFactory = Symbol('ToolbarFactory');
+export type Toolbar = TabBarToolbar;
+
+export type ToolbarItem = ToolbarContribution | TabBarToolbarItem;
+export interface DeflatedContributedToolbarItem { id: string; group: 'contributed' };
+export type ToolbarItemDeflated = DeflatedContributedToolbarItem | TabBarToolbarItem;
+
+export const LateInjector = Symbol('LateInjector');
+
+export const lateInjector = <T>(
+    context: interfaces.Container,
+    serviceIdentifier: interfaces.ServiceIdentifier<T>,
+): T => context.get<T>(serviceIdentifier);
+
+export interface ToolbarItemPosition {
+    alignment: ToolbarAlignment;
+    groupIndex: number;
+    itemIndex: number;
+}
+
+export enum IconSet {
+    FA = 'fa',
+    CODICON = 'codicon'
+}
+

package/src/browser/toolbar-preference-contribution.ts

@@ -1,38 +1,38 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { PreferenceSchema, PreferenceProxy, PreferenceScope } from '@theia/core/lib/browser';
-
-export const TOOLBAR_ENABLE_PREFERENCE_ID = 'toolbar.showToolbar';
-
-export const ToolbarPreferencesSchema: PreferenceSchema = {
-    type: 'object',
-    properties: {
-        [TOOLBAR_ENABLE_PREFERENCE_ID]: {
-            'type': 'boolean',
-            'description': 'Show toolbar',
-            'default': false,
-            'scope': PreferenceScope.Workspace,
-        },
-    },
-};
-
-class ToolbarPreferencesContribution {
-    [TOOLBAR_ENABLE_PREFERENCE_ID]: boolean;
-}
-
-export const ToolbarPreferences = Symbol('ToolbarPreferences');
-export type ToolbarPreferences = PreferenceProxy<ToolbarPreferencesContribution>;
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { PreferenceSchema, PreferenceProxy, PreferenceScope } from '@theia/core/lib/browser';
+
+export const TOOLBAR_ENABLE_PREFERENCE_ID = 'toolbar.showToolbar';
+
+export const ToolbarPreferencesSchema: PreferenceSchema = {
+    type: 'object',
+    properties: {
+        [TOOLBAR_ENABLE_PREFERENCE_ID]: {
+            'type': 'boolean',
+            'description': 'Show toolbar',
+            'default': false,
+            'scope': PreferenceScope.Workspace,
+        },
+    },
+};
+
+class ToolbarPreferencesContribution {
+    [TOOLBAR_ENABLE_PREFERENCE_ID]: boolean;
+}
+
+export const ToolbarPreferences = Symbol('ToolbarPreferences');
+export type ToolbarPreferences = PreferenceProxy<ToolbarPreferencesContribution>;

package/src/browser/toolbar-preference-schema.ts

@@ -1,75 +1,75 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { IJSONSchema } from '@theia/core/lib/common/json-schema';
-import * as Ajv from '@theia/core/shared/ajv';
-import { DeflatedToolbarTree } from './toolbar-interfaces';
-
-const toolbarColumnGroup: IJSONSchema = {
-    'type': 'array',
-    'description': 'Array of subgroups for right toolbar column',
-    'items': {
-        'type': 'array',
-        'description': 'Grouping',
-        'items': {
-            'type': 'object',
-            'properties': {
-                'id': { 'type': 'string' },
-                'command': { 'type': 'string' },
-                'icon': { 'type': 'string' },
-                'tooltip': { 'type': 'string' },
-                'group': { 'enum': ['contributed'] },
-                'when': { 'type': 'string' },
-            },
-            'required': [
-                'id',
-            ],
-            'additionalProperties': false,
-        }
-    }
-};
-
-export const toolbarSchemaId = 'vscode://schemas/toolbar';
-export const toolbarConfigurationSchema: IJSONSchema = {
-    // '$schema': 'https://json-schema.org/draft/2019-09/schema',
-    '$id': 'vscode://schemas/indexing-grid',
-    'type': 'object',
-    'title': 'Toolbar',
-    'properties': {
-        'items': {
-            'type': 'object',
-            'properties': {
-                'left': toolbarColumnGroup,
-                'center': toolbarColumnGroup,
-                'right': toolbarColumnGroup,
-            },
-            'required': [
-                'left',
-                'center',
-                'right'
-            ],
-            'additionalProperties': false,
-        }
-    },
-    'required': [
-        'items'
-    ]
-};
-
-const validator = new Ajv().compile(toolbarConfigurationSchema);
-export function isToolbarPreferences(candidate: unknown): candidate is DeflatedToolbarTree {
-    return Boolean(validator(candidate));
-}
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { IJSONSchema } from '@theia/core/lib/common/json-schema';
+import * as Ajv from '@theia/core/shared/ajv';
+import { DeflatedToolbarTree } from './toolbar-interfaces';
+
+const toolbarColumnGroup: IJSONSchema = {
+    'type': 'array',
+    'description': 'Array of subgroups for right toolbar column',
+    'items': {
+        'type': 'array',
+        'description': 'Grouping',
+        'items': {
+            'type': 'object',
+            'properties': {
+                'id': { 'type': 'string' },
+                'command': { 'type': 'string' },
+                'icon': { 'type': 'string' },
+                'tooltip': { 'type': 'string' },
+                'group': { 'enum': ['contributed'] },
+                'when': { 'type': 'string' },
+            },
+            'required': [
+                'id',
+            ],
+            'additionalProperties': false,
+        }
+    }
+};
+
+export const toolbarSchemaId = 'vscode://schemas/toolbar';
+export const toolbarConfigurationSchema: IJSONSchema = {
+    // '$schema': 'https://json-schema.org/draft/2019-09/schema',
+    '$id': 'vscode://schemas/indexing-grid',
+    'type': 'object',
+    'title': 'Toolbar',
+    'properties': {
+        'items': {
+            'type': 'object',
+            'properties': {
+                'left': toolbarColumnGroup,
+                'center': toolbarColumnGroup,
+                'right': toolbarColumnGroup,
+            },
+            'required': [
+                'left',
+                'center',
+                'right'
+            ],
+            'additionalProperties': false,
+        }
+    },
+    'required': [
+        'items'
+    ]
+};
+
+const validator = new Ajv().compile(toolbarConfigurationSchema);
+export function isToolbarPreferences(candidate: unknown): candidate is DeflatedToolbarTree {
+    return Boolean(validator(candidate));
+}