From 1342fde7c08e82ab27fc5b52d2d5f6f301af181f Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Wed, 31 May 2023 12:43:07 -0400 Subject: [PATCH] [License] update license SPDX in all package.json, source file headers 1) as per Wayne's suggestion, it would be clearer to use the SPDX that reflects the fact that our secondary license is of the "GPL-2.0-ONLY" type 2) rename LICENSE-GPL to more precisely reflect our secondary license 3) As per SPDX[1], it seems that our secondary license text has accidently deviated from stock, during a recent refactoring. Let's restore it to what it should be. [1]: https://spdx.org/licenses/GPL-2.0-with-classpath-exception.html Signed-off-by: Marc Dumais --- .github/workflows/set-milestone-on-pr.yml | 2 +- .vscode/theia.code-snippets | 4 +- ...> LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION | 38 +- NOTICE.md | 2 +- README.md | 22 +- configs/errors.eslintrc.json | 2 +- dev-packages/application-manager/package.json | 2 +- .../src/application-package-manager.ts | 2 +- .../src/application-process.ts | 2 +- .../application-manager/src/expose-loader.ts | 2 +- .../src/generator/abstract-generator.ts | 2 +- .../src/generator/backend-generator.ts | 2 +- .../src/generator/frontend-generator.ts | 2 +- .../src/generator/index.ts | 2 +- .../src/generator/webpack-generator.ts | 2 +- dev-packages/application-manager/src/index.ts | 2 +- .../application-manager/src/package.spec.ts | 2 +- .../application-manager/src/rebuild.ts | 2 +- dev-packages/application-package/package.json | 2 +- dev-packages/application-package/src/api.ts | 2 +- .../src/application-package.spec.ts | 2 +- .../src/application-package.ts | 2 +- .../src/application-props.ts | 2 +- .../application-package/src/environment.ts | 2 +- .../src/extension-package-collector.ts | 2 +- .../src/extension-package.ts | 2 +- dev-packages/application-package/src/index.ts | 2 +- .../application-package/src/json-file.ts | 2 +- .../application-package/src/npm-registry.ts | 2 +- dev-packages/cli/package.json | 2 +- dev-packages/cli/src/check-dependencies.ts | 2 +- dev-packages/cli/src/download-plugins.ts | 2 +- dev-packages/cli/src/run-test.ts | 2 +- dev-packages/cli/src/test-page.ts | 2 +- dev-packages/cli/src/theia.ts | 2 +- dev-packages/ffmpeg/native/ffmpeg.c | 2 +- dev-packages/ffmpeg/native/linux-ffmpeg.c | 2 +- dev-packages/ffmpeg/native/mac-ffmpeg.c | 2 +- dev-packages/ffmpeg/native/win-ffmpeg.c | 2 +- dev-packages/ffmpeg/package.json | 2 +- dev-packages/ffmpeg/src/check-ffmpeg.ts | 2 +- dev-packages/ffmpeg/src/ffmpeg.ts | 2 +- dev-packages/ffmpeg/src/hash.ts | 2 +- dev-packages/ffmpeg/src/index.ts | 2 +- dev-packages/ffmpeg/src/replace-ffmpeg.ts | 2 +- .../localization-manager/package.json | 2 +- .../localization-manager/src/common.ts | 2 +- .../localization-manager/src/deepl-api.ts | 2 +- .../localization-manager/src/index.ts | 2 +- .../src/localization-extractor.spec.ts | 2 +- .../src/localization-extractor.ts | 2 +- .../src/localization-manager.spec.ts | 2 +- .../src/localization-manager.ts | 2 +- dev-packages/ovsx-client/package.json | 2 +- dev-packages/ovsx-client/src/index.ts | 2 +- .../ovsx-client/src/ovsx-client.spec.ts | 2 +- dev-packages/ovsx-client/src/ovsx-client.ts | 2 +- dev-packages/ovsx-client/src/ovsx-types.ts | 2 +- dev-packages/private-eslint-plugin/index.js | 2 +- .../rules/localization-check.js | 2 +- .../rules/no-src-import.js | 2 +- .../rules/runtime-import-check.js | 2 +- .../rules/shared-dependencies.js | 2 +- dev-packages/private-ext-scripts/package.json | 2 +- dev-packages/private-ext-scripts/theia-ext.js | 2 +- dev-packages/private-ext-scripts/theia-run.js | 2 +- .../private-ext-scripts/theia-ts-clean.js | 2 +- .../bin-package-re-exports-from-package.ts | 2 +- .../src/bin-theia-re-exports.ts | 2 +- dev-packages/private-re-exports/src/index.ts | 2 +- .../src/package-re-exports.ts | 2 +- .../private-re-exports/src/utility.spec.ts | 2 +- .../private-re-exports/src/utility.ts | 2 +- dev-packages/request/package.json | 2 +- .../request/src/common-request-service.ts | 2 +- dev-packages/request/src/index.ts | 2 +- .../request/src/node-request-service.ts | 2 +- dev-packages/request/src/package.spec.ts | 2 +- dev-packages/request/src/proxy.ts | 2 +- examples/api-samples/package.json | 2 +- .../browser/api-samples-frontend-module.ts | 2 +- .../sample-filtered-command-contribution.ts | 2 +- .../sample-file-watching-contribution.ts | 2 +- ...mic-label-provider-command-contribution.ts | 2 +- ...ple-dynamic-label-provider-contribution.ts | 2 +- .../menu/sample-browser-menu-module.ts | 2 +- .../browser/menu/sample-menu-contribution.ts | 2 +- .../monaco-editor-preference-extractor.ts | 4 +- .../sample-output-channel-with-severity.ts | 2 +- .../src/browser/style/branding.css | 24 +- .../toolbar/sample-toolbar-contribution.css | 25 +- .../toolbar/sample-toolbar-contribution.tsx | 2 +- .../sample-toolbar-defaults-override.ts | 2 +- .../sample-unclosable-view-contribution.ts | 2 +- .../browser/view/sample-unclosable-view.tsx | 2 +- .../vsx/sample-vsx-command-contribution.ts | 2 +- .../src/common/updater/sample-updater.ts | 2 +- .../menu/sample-electron-menu-module.ts | 2 +- .../sample-updater-frontend-contribution.ts | 2 +- .../updater/sample-updater-frontend-module.ts | 2 +- .../update/sample-updater-impl.ts | 2 +- .../update/sample-updater-main-module.ts | 2 +- .../src/node/api-samples-backend-module.ts | 2 +- .../node/sample-backend-application-server.ts | 2 +- examples/api-tests/package.json | 2 +- examples/api-tests/src/api-tests.d.ts | 2 +- examples/api-tests/src/browser-utils.spec.js | 2 +- .../api-tests/src/contribution-filter.spec.js | 2 +- .../api-tests/src/explorer-open-close.spec.js | 2 +- examples/api-tests/src/file-search.spec.js | 2 +- examples/api-tests/src/find-replace.spec.js | 2 +- examples/api-tests/src/keybindings.spec.js | 2 +- .../api-tests/src/launch-preferences.spec.js | 2 +- examples/api-tests/src/menus.spec.js | 2 +- examples/api-tests/src/monaco-api.spec.js | 4 +- examples/api-tests/src/navigator.spec.js | 2 +- examples/api-tests/src/preferences.spec.js | 2 +- examples/api-tests/src/saveable.spec.js | 2 +- examples/api-tests/src/scm.spec.js | 2 +- examples/api-tests/src/shell.spec.js | 2 +- .../api-tests/src/task-configurations.spec.js | 2 +- examples/api-tests/src/typescript.spec.js | 8 +- .../api-tests/src/undo-redo-selectAll.spec.js | 2 +- examples/api-tests/src/views.spec.js | 2 +- examples/browser/package.json | 2 +- examples/electron/package.json | 2 +- examples/electron/test/basic-example.espec.ts | 2 +- examples/playwright/package.json | 2 +- examples/playwright/playwright.config.ts | 2 +- examples/playwright/src/index.ts | 2 +- .../src/tests/fixtures/theia-fixture.ts | 2 +- .../playwright/src/tests/theia-app.test.ts | 2 +- .../src/tests/theia-explorer-view.test.ts | 2 +- .../src/tests/theia-main-menu.test.ts | 2 +- .../src/tests/theia-output-view.test.ts | 2 +- .../src/tests/theia-preference-view.test.ts | 2 +- .../src/tests/theia-problems-view.test.ts | 2 +- .../src/tests/theia-quick-command.test.ts | 2 +- .../src/tests/theia-sample-app.test.ts | 2 +- .../src/tests/theia-status-bar.test.ts | 2 +- .../src/tests/theia-terminal-view.test.ts | 2 +- .../src/tests/theia-text-editor.test.ts | 2 +- .../src/tests/theia-toolbar.test.ts | 2 +- .../src/tests/theia-workspace.test.ts | 2 +- examples/playwright/src/theia-about-dialog.ts | 2 +- examples/playwright/src/theia-app.ts | 2 +- examples/playwright/src/theia-context-menu.ts | 2 +- examples/playwright/src/theia-dialog.ts | 2 +- examples/playwright/src/theia-editor.ts | 2 +- .../playwright/src/theia-explorer-view.ts | 2 +- examples/playwright/src/theia-main-menu.ts | 2 +- examples/playwright/src/theia-menu-item.ts | 2 +- examples/playwright/src/theia-menu.ts | 2 +- .../playwright/src/theia-monaco-editor.ts | 2 +- .../src/theia-notification-indicator.ts | 2 +- .../src/theia-notification-overlay.ts | 2 +- .../playwright/src/theia-output-channel.ts | 2 +- examples/playwright/src/theia-output-view.ts | 2 +- examples/playwright/src/theia-page-object.ts | 2 +- .../playwright/src/theia-preference-view.ts | 2 +- .../playwright/src/theia-problem-indicator.ts | 2 +- examples/playwright/src/theia-problem-view.ts | 2 +- .../src/theia-quick-command-palette.ts | 2 +- .../playwright/src/theia-rename-dialog.ts | 2 +- examples/playwright/src/theia-status-bar.ts | 2 +- .../playwright/src/theia-status-indicator.ts | 2 +- examples/playwright/src/theia-terminal.ts | 2 +- examples/playwright/src/theia-text-editor.ts | 2 +- .../src/theia-toggle-bottom-indicator.ts | 2 +- examples/playwright/src/theia-toolbar-item.ts | 2 +- examples/playwright/src/theia-toolbar.ts | 2 +- examples/playwright/src/theia-tree-node.ts | 2 +- examples/playwright/src/theia-view.ts | 2 +- examples/playwright/src/theia-workspace.ts | 2 +- examples/playwright/src/util.ts | 2 +- logo/theia-logo-gray.svg | 2 +- logo/theia-logo-no-text-black.svg | 2 +- logo/theia-logo-no-text-white.svg | 2 +- logo/theia-logo-white.svg | 2 +- logo/theia-logo.svg | 2 +- logo/theia.svg | 2 +- packages/bulk-edit/package.json | 2 +- .../src/browser/bulk-edit-commands.ts | 2 +- .../src/browser/bulk-edit-contribution.ts | 2 +- .../src/browser/bulk-edit-frontend-module.ts | 2 +- .../browser/bulk-edit-tree-label-provider.ts | 2 +- .../bulk-edit-node-selection.ts | 2 +- .../bulk-edit-tree-container.ts | 2 +- .../bulk-edit-tree/bulk-edit-tree-model.ts | 2 +- .../bulk-edit-tree/bulk-edit-tree-widget.tsx | 2 +- .../bulk-edit-tree/bulk-edit-tree.spec.ts | 2 +- .../browser/bulk-edit-tree/bulk-edit-tree.ts | 2 +- .../src/browser/bulk-edit-tree/index.ts | 2 +- .../bulk-edit/src/browser/style/bulk-edit.css | 2 +- packages/callhierarchy/package.json | 2 +- .../src/browser/callhierarchy-contribution.ts | 2 +- .../browser/callhierarchy-frontend-module.ts | 2 +- .../src/browser/callhierarchy-service.ts | 2 +- .../callhierarchy-tree-container.ts | 2 +- .../callhierarchy-tree-model.ts | 2 +- .../callhierarchy-tree-widget.tsx | 2 +- .../callhierarchy-tree/callhierarchy-tree.ts | 2 +- .../src/browser/callhierarchy-tree/index.ts | 2 +- .../src/browser/callhierarchy.ts | 2 +- packages/callhierarchy/src/browser/index.ts | 2 +- .../callhierarchy/src/browser/style/index.css | 36 +- packages/callhierarchy/src/browser/utils.ts | 2 +- packages/callhierarchy/src/package.spec.ts | 2 +- packages/console/package.json | 2 +- .../console/src/browser/ansi-console-item.tsx | 2 +- .../src/browser/console-content-widget.tsx | 2 +- .../src/browser/console-contribution.ts | 2 +- .../src/browser/console-frontend-module.ts | 2 +- .../console/src/browser/console-history.ts | 2 +- .../browser/console-keybinding-contexts.ts | 2 +- .../console/src/browser/console-manager.ts | 2 +- .../src/browser/console-session-manager.ts | 2 +- .../console/src/browser/console-session.ts | 2 +- .../console/src/browser/console-widget.ts | 2 +- packages/console/src/browser/style/index.css | 34 +- packages/console/src/package.spec.ts | 2 +- packages/core/package.json | 2 +- packages/core/scripts/generate-layout.js | 2 +- packages/core/src/browser/about-dialog.tsx | 2 +- .../src/browser/authentication-service.ts | 2 +- .../breadcrumbs/breadcrumb-popup-container.ts | 2 +- .../breadcrumbs/breadcrumb-renderer.tsx | 2 +- .../breadcrumbs/breadcrumbs-constants.ts | 2 +- .../breadcrumbs/breadcrumbs-renderer.tsx | 2 +- .../breadcrumbs/breadcrumbs-service.ts | 2 +- .../core/src/browser/breadcrumbs/index.ts | 2 +- .../src/browser/browser-clipboard-service.ts | 2 +- packages/core/src/browser/browser.ts | 2 +- .../core/src/browser/clipboard-service.ts | 2 +- .../browser/color-application-contribution.ts | 2 +- packages/core/src/browser/color-registry.ts | 2 +- .../core/src/browser/command-open-handler.ts | 2 +- .../browser/common-frontend-contribution.ts | 2 +- .../browser/common-styling-participants.ts | 2 +- .../browser/connection-status-service.spec.ts | 4 +- .../src/browser/connection-status-service.ts | 2 +- .../core/src/browser/context-key-service.ts | 2 +- .../core/src/browser/context-menu-renderer.ts | 2 +- packages/core/src/browser/core-preferences.ts | 2 +- .../core/src/browser/credentials-service.ts | 4 +- packages/core/src/browser/decoration-style.ts | 2 +- .../core/src/browser/decorations-service.ts | 2 +- packages/core/src/browser/dialogs.ts | 2 +- .../core/src/browser/dialogs/react-dialog.tsx | 2 +- packages/core/src/browser/diff-uris.ts | 2 +- .../core/src/browser/encoding-registry.ts | 2 +- packages/core/src/browser/endpoint.spec.ts | 2 +- packages/core/src/browser/endpoint.ts | 2 +- .../core/src/browser/external-uri-service.ts | 2 +- packages/core/src/browser/file-icons-js.d.ts | 2 +- .../browser/frontend-application-bindings.ts | 2 +- ...ontend-application-config-provider.spec.ts | 2 +- .../frontend-application-config-provider.ts | 2 +- .../browser/frontend-application-module.ts | 2 +- .../src/browser/frontend-application-state.ts | 2 +- .../core/src/browser/frontend-application.ts | 2 +- packages/core/src/browser/hover-service.ts | 4 +- .../core/src/browser/http-open-handler.ts | 2 +- .../src/browser/i18n/i18n-frontend-module.ts | 2 +- .../i18n/language-quick-pick-service.ts | 2 +- .../src/browser/icon-theme-contribution.ts | 2 +- .../core/src/browser/icon-theme-service.ts | 2 +- packages/core/src/browser/index.ts | 2 +- .../core/src/browser/json-schema-store.ts | 2 +- packages/core/src/browser/keybinding.spec.ts | 2 +- packages/core/src/browser/keybinding.ts | 2 +- .../browser-keyboard-frontend-contribution.ts | 2 +- .../browser-keyboard-layout-provider.spec.ts | 2 +- .../browser-keyboard-layout-provider.ts | 2 +- .../keyboard/browser-keyboard-module.ts | 2 +- packages/core/src/browser/keyboard/index.ts | 2 +- .../keyboard/keyboard-layout-service.spec.ts | 2 +- .../keyboard/keyboard-layout-service.ts | 2 +- .../core/src/browser/keyboard/keys.spec.ts | 2 +- packages/core/src/browser/keyboard/keys.ts | 2 +- packages/core/src/browser/keys.ts | 2 +- .../core/src/browser/label-parser.spec.ts | 2 +- packages/core/src/browser/label-parser.ts | 2 +- .../core/src/browser/label-provider.spec.ts | 2 +- packages/core/src/browser/label-provider.ts | 2 +- packages/core/src/browser/language-service.ts | 2 +- .../src/browser/logger-frontend-module.ts | 2 +- .../markdown-rendering/markdown-renderer.ts | 2 +- .../menu/browser-context-menu-renderer.ts | 2 +- .../src/browser/menu/browser-menu-module.ts | 2 +- .../src/browser/menu/browser-menu-plugin.ts | 2 +- .../src/browser/menu/context-menu-context.ts | 2 +- packages/core/src/browser/messaging/index.ts | 2 +- .../messaging/messaging-frontend-module.ts | 2 +- .../messaging/ws-connection-provider.ts | 2 +- packages/core/src/browser/mime-service.ts | 2 +- .../core/src/browser/navigatable-types.ts | 2 +- packages/core/src/browser/navigatable.ts | 2 +- .../core/src/browser/opener-service.spec.ts | 2 +- packages/core/src/browser/opener-service.ts | 2 +- .../browser/performance/frontend-stopwatch.ts | 2 +- .../core/src/browser/performance/index.ts | 2 +- .../measurement-frontend-bindings.ts | 2 +- .../core/src/browser/preferences/index.ts | 2 +- .../injectable-preference-proxy.ts | 2 +- .../preferences/preference-configurations.ts | 2 +- .../preferences/preference-contribution.ts | 2 +- .../preference-language-override-service.ts | 2 +- .../preferences/preference-provider.spec.ts | 2 +- .../preferences/preference-provider.ts | 2 +- .../preferences/preference-proxy.spec.ts | 2 +- .../browser/preferences/preference-proxy.ts | 2 +- .../preference-schema-provider.spec.ts | 2 +- .../browser/preferences/preference-scope.ts | 2 +- .../preferences/preference-service.spec.ts | 2 +- .../browser/preferences/preference-service.ts | 2 +- .../preference-validation-service.spec.ts | 2 +- .../preference-validation-service.ts | 2 +- .../src/browser/preferences/test/index.ts | 2 +- .../test/mock-preference-provider.ts | 2 +- .../preferences/test/mock-preference-proxy.ts | 2 +- .../test/mock-preference-service.ts | 2 +- packages/core/src/browser/preloader.ts | 2 +- .../core/src/browser/progress-bar-factory.ts | 4 +- packages/core/src/browser/progress-bar.ts | 2 +- packages/core/src/browser/progress-client.ts | 2 +- .../browser/progress-location-service.spec.ts | 2 +- .../src/browser/progress-location-service.ts | 2 +- .../src/browser/progress-status-bar-item.ts | 2 +- .../core/src/browser/quick-input/index.ts | 2 +- .../src/browser/quick-input/quick-access.ts | 2 +- .../quick-command-frontend-contribution.ts | 2 +- .../quick-input/quick-command-service.ts | 2 +- .../browser/quick-input/quick-help-service.ts | 2 +- .../quick-input-frontend-contribution.ts | 2 +- .../quick-input/quick-input-service.spec.ts | 2 +- .../quick-input/quick-input-service.ts | 2 +- .../quick-input/quick-pick-service-impl.ts | 2 +- .../browser/quick-input/quick-view-service.ts | 2 +- .../browser/request/browser-request-module.ts | 2 +- .../request/browser-request-service.ts | 2 +- .../core/src/browser/resource-context-key.ts | 2 +- .../core/src/browser/save-resource-service.ts | 2 +- packages/core/src/browser/saveable.ts | 2 +- .../src/browser/secondary-window-handler.ts | 2 +- .../shell/application-shell-mouse-tracker.ts | 2 +- .../src/browser/shell/application-shell.ts | 2 +- .../shell/current-widget-command-adapter.ts | 2 +- packages/core/src/browser/shell/index.ts | 2 +- .../browser/shell/shell-layout-restorer.ts | 2 +- .../src/browser/shell/side-panel-handler.ts | 2 +- .../src/browser/shell/side-panel-toolbar.ts | 2 +- .../shell/sidebar-bottom-menu-widget.tsx | 2 +- .../src/browser/shell/sidebar-menu-widget.tsx | 2 +- .../browser/shell/sidebar-top-menu-widget.tsx | 2 +- .../core/src/browser/shell/split-panels.ts | 2 +- .../src/browser/shell/tab-bar-decorator.ts | 2 +- .../browser/shell/tab-bar-toolbar/index.ts | 2 +- .../tab-bar-toolbar-menu-adapters.ts | 2 +- .../tab-bar-toolbar-registry.ts | 2 +- .../tab-bar-toolbar/tab-bar-toolbar-types.ts | 2 +- .../tab-bar-toolbar/tab-bar-toolbar.spec.ts | 2 +- .../shell/tab-bar-toolbar/tab-bar-toolbar.tsx | 2 +- .../core/src/browser/shell/tab-bars.spec.ts | 2 +- packages/core/src/browser/shell/tab-bars.ts | 2 +- .../src/browser/shell/theia-dock-panel.ts | 2 +- .../src/browser/shell/view-contribution.ts | 2 +- .../core/src/browser/source-tree/index.ts | 2 +- .../source-tree/source-tree-widget.tsx | 2 +- .../src/browser/source-tree/source-tree.ts | 2 +- .../src/browser/source-tree/tree-source.ts | 2 +- packages/core/src/browser/status-bar/index.ts | 2 +- .../browser/status-bar/status-bar-types.ts | 2 +- .../status-bar/status-bar-view-model.ts | 2 +- .../src/browser/status-bar/status-bar.tsx | 2 +- .../core/src/browser/storage-service.spec.ts | 2 +- packages/core/src/browser/storage-service.ts | 2 +- packages/core/src/browser/style/about.css | 20 +- .../core/src/browser/style/alert-messages.css | 43 +- packages/core/src/browser/style/ansi.css | 34 +- .../core/src/browser/style/breadcrumbs.css | 142 ++-- packages/core/src/browser/style/dialog.css | 139 ++-- packages/core/src/browser/style/dockpanel.css | 16 +- .../core/src/browser/style/hover-service.css | 82 +-- packages/core/src/browser/style/icons.css | 40 +- packages/core/src/browser/style/index.css | 183 ++--- packages/core/src/browser/style/menus.css | 55 +- .../core/src/browser/style/notification.css | 32 +- .../core/src/browser/style/progress-bar.css | 39 +- .../src/browser/style/quick-title-bar.css | 32 +- .../core/src/browser/style/scrollbars.css | 141 ++-- .../core/src/browser/style/search-box.css | 106 +-- .../src/browser/style/select-component.css | 108 +-- packages/core/src/browser/style/sidepanel.css | 121 +-- .../core/src/browser/style/status-bar.css | 93 +-- packages/core/src/browser/style/tooltip.css | 12 +- .../src/browser/style/tree-decorators.css | 68 +- packages/core/src/browser/style/tree.css | 198 ++--- .../core/src/browser/style/view-container.css | 173 +++-- packages/core/src/browser/style/widget.css | 4 +- packages/core/src/browser/styling-service.ts | 2 +- .../core/src/browser/supported-encodings.ts | 2 +- packages/core/src/browser/test/jsdom.ts | 2 +- .../test/mock-connection-status-service.ts | 2 +- .../browser/test/mock-env-variables-server.ts | 2 +- .../src/browser/test/mock-opener-service.ts | 2 +- .../src/browser/test/mock-storage-service.ts | 2 +- packages/core/src/browser/theming.ts | 2 +- packages/core/src/browser/tooltip-service.tsx | 2 +- .../src/browser/tree/fuzzy-search.spec.ts | 2 +- .../core/src/browser/tree/fuzzy-search.ts | 2 +- packages/core/src/browser/tree/index.ts | 2 +- .../src/browser/tree/search-box-debounce.ts | 2 +- packages/core/src/browser/tree/search-box.ts | 2 +- .../src/browser/tree/test/mock-tree-model.ts | 2 +- .../browser/tree/test/tree-test-container.ts | 2 +- .../compressed-tree-expansion-service.ts | 2 +- .../tree-compression/compressed-tree-model.ts | 2 +- .../compressed-tree-widget.tsx | 2 +- .../browser/tree/tree-compression/index.ts | 2 +- .../tree-compression-service.ts | 2 +- .../tree-compression/tree-compression.css | 10 +- .../src/browser/tree/tree-consistency.spec.ts | 2 +- .../src/browser/tree/tree-container.spec.ts | 2 +- .../core/src/browser/tree/tree-container.ts | 2 +- .../src/browser/tree/tree-decorator.spec.ts | 2 +- .../core/src/browser/tree/tree-decorator.ts | 2 +- .../src/browser/tree/tree-expansion.spec.ts | 2 +- .../core/src/browser/tree/tree-expansion.ts | 2 +- .../src/browser/tree/tree-focus-service.ts | 2 +- .../src/browser/tree/tree-iterator.spec.ts | 2 +- .../core/src/browser/tree/tree-iterator.ts | 2 +- .../src/browser/tree/tree-label-provider.ts | 2 +- packages/core/src/browser/tree/tree-model.ts | 2 +- .../core/src/browser/tree/tree-navigation.ts | 2 +- packages/core/src/browser/tree/tree-search.ts | 2 +- .../src/browser/tree/tree-selection-impl.ts | 2 +- .../browser/tree/tree-selection-state.spec.ts | 2 +- .../src/browser/tree/tree-selection-state.ts | 2 +- .../core/src/browser/tree/tree-selection.ts | 2 +- .../browser/tree/tree-view-welcome-widget.tsx | 2 +- .../src/browser/tree/tree-widget-selection.ts | 2 +- .../core/src/browser/tree/tree-widget.tsx | 2 +- packages/core/src/browser/tree/tree.spec.ts | 2 +- packages/core/src/browser/tree/tree.ts | 2 +- .../user-working-directory-provider.ts | 2 +- packages/core/src/browser/view-container.ts | 2 +- .../core/src/browser/widget-decoration.ts | 2 +- .../core/src/browser/widget-manager.spec.ts | 2 +- packages/core/src/browser/widget-manager.ts | 2 +- .../core/src/browser/widget-open-handler.ts | 2 +- .../src/browser/widgets/alert-message.tsx | 2 +- .../src/browser/widgets/extractable-widget.ts | 2 +- packages/core/src/browser/widgets/index.ts | 2 +- .../src/browser/widgets/react-renderer.tsx | 2 +- .../core/src/browser/widgets/react-widget.tsx | 2 +- .../src/browser/widgets/select-component.tsx | 2 +- packages/core/src/browser/widgets/widget.ts | 2 +- .../core/src/browser/window-contribution.ts | 2 +- .../browser/window/browser-window-module.ts | 2 +- .../default-secondary-window-service.ts | 2 +- .../window/default-window-service.spec.ts | 2 +- .../browser/window/default-window-service.ts | 2 +- .../window/secondary-window-service.ts | 2 +- .../window/test/mock-window-service.ts | 2 +- .../core/src/browser/window/window-service.ts | 2 +- .../browser/window/window-title-service.ts | 2 +- .../browser/window/window-title-updater.ts | 2 +- packages/core/src/common/accessibility.ts | 2 +- .../core/src/common/application-error.spec.ts | 2 +- packages/core/src/common/application-error.ts | 2 +- .../core/src/common/application-protocol.ts | 2 +- packages/core/src/common/array-utils.ts | 2 +- packages/core/src/common/buffer.ts | 2 +- packages/core/src/common/cancellation.ts | 2 +- packages/core/src/common/char-code.ts | 2 +- packages/core/src/common/color.ts | 2 +- packages/core/src/common/command.spec.ts | 2 +- packages/core/src/common/command.ts | 2 +- .../contribution-filter-registry.ts | 2 +- .../contribution-filter.ts | 2 +- .../src/common/contribution-filter/filter.ts | 2 +- .../src/common/contribution-filter/index.ts | 2 +- .../core/src/common/contribution-provider.ts | 2 +- packages/core/src/common/disposable.spec.ts | 2 +- packages/core/src/common/disposable.ts | 2 +- packages/core/src/common/encoding-service.ts | 2 +- packages/core/src/common/encodings.ts | 2 +- .../env-variables/env-variables-protocol.ts | 2 +- .../core/src/common/env-variables/index.ts | 2 +- packages/core/src/common/event.spec.ts | 2 +- packages/core/src/common/event.ts | 2 +- .../src/common/frontend-application-state.ts | 2 +- packages/core/src/common/glob.ts | 2 +- packages/core/src/common/i18n/localization.ts | 2 +- packages/core/src/common/index.ts | 2 +- packages/core/src/common/json-schema.ts | 2 +- packages/core/src/common/keybinding.ts | 2 +- .../keyboard/keyboard-layout-provider.ts | 2 +- packages/core/src/common/keys.ts | 2 +- packages/core/src/common/keytar-protocol.ts | 2 +- packages/core/src/common/label-protocol.ts | 2 +- packages/core/src/common/logger-protocol.ts | 2 +- packages/core/src/common/logger-watcher.ts | 2 +- packages/core/src/common/logger.spec.ts | 2 +- packages/core/src/common/logger.ts | 2 +- packages/core/src/common/lsp-types.ts | 2 +- .../markdown-rendering/icon-utilities.ts | 2 +- .../src/common/markdown-rendering/index.ts | 2 +- .../markdown-rendering/markdown-string.ts | 2 +- .../core/src/common/menu/action-menu-node.ts | 2 +- .../src/common/menu/composite-menu-node.ts | 2 +- packages/core/src/common/menu/index.ts | 2 +- packages/core/src/common/menu/menu-adapter.ts | 2 +- .../src/common/menu/menu-model-registry.ts | 2 +- packages/core/src/common/menu/menu-types.ts | 2 +- packages/core/src/common/menu/menu.spec.ts | 2 +- .../src/common/message-rpc/channel.spec.ts | 2 +- .../core/src/common/message-rpc/channel.ts | 2 +- packages/core/src/common/message-rpc/index.ts | 2 +- .../src/common/message-rpc/message-buffer.ts | 2 +- .../message-rpc/msg-pack-extension-manager.ts | 2 +- .../message-rpc/rpc-message-encoder.spec.ts | 2 +- .../common/message-rpc/rpc-message-encoder.ts | 2 +- .../src/common/message-rpc/rpc-protocol.ts | 2 +- .../uint8-array-message-buffer.spec.ts | 2 +- .../message-rpc/uint8-array-message-buffer.ts | 2 +- .../src/common/message-service-protocol.ts | 2 +- packages/core/src/common/message-service.ts | 2 +- .../messaging/abstract-connection-provider.ts | 2 +- .../messaging/connection-error-handler.ts | 2 +- packages/core/src/common/messaging/handler.ts | 2 +- packages/core/src/common/messaging/index.ts | 2 +- .../common/messaging/proxy-factory.spec.ts | 2 +- .../src/common/messaging/proxy-factory.ts | 2 +- .../common/messaging/web-socket-channel.ts | 2 +- packages/core/src/common/nls.ts | 2 +- packages/core/src/common/numbers.ts | 2 +- packages/core/src/common/objects.spec.ts | 2 +- packages/core/src/common/objects.ts | 2 +- packages/core/src/common/os.ts | 2 +- packages/core/src/common/path.spec.ts | 2 +- packages/core/src/common/path.ts | 2 +- packages/core/src/common/paths.ts | 2 +- packages/core/src/common/performance/index.ts | 2 +- .../performance/measurement-protocol.ts | 2 +- .../src/common/performance/measurement.ts | 2 +- .../core/src/common/performance/stopwatch.ts | 2 +- .../common/preferences/preference-schema.ts | 2 +- .../preferences/preference-scope.spec.ts | 2 +- .../common/preferences/preference-scope.ts | 2 +- packages/core/src/common/prioritizeable.ts | 2 +- .../src/common/progress-service-protocol.ts | 2 +- packages/core/src/common/progress-service.ts | 2 +- packages/core/src/common/promise-util.spec.ts | 2 +- packages/core/src/common/promise-util.ts | 2 +- .../core/src/common/quick-pick-service.ts | 4 +- packages/core/src/common/reference.spec.ts | 2 +- packages/core/src/common/reference.ts | 2 +- packages/core/src/common/resource.ts | 2 +- .../src/common/selection-command-handler.ts | 2 +- .../core/src/common/selection-service.spec.ts | 2 +- packages/core/src/common/selection-service.ts | 2 +- packages/core/src/common/selection.ts | 2 +- packages/core/src/common/severity.ts | 2 +- packages/core/src/common/stream.ts | 2 +- packages/core/src/common/strings.ts | 2 +- packages/core/src/common/telemetry.ts | 2 +- .../core/src/common/ternary-search-tree.ts | 2 +- packages/core/src/common/test/expect.ts | 2 +- packages/core/src/common/test/mock-logger.ts | 2 +- packages/core/src/common/test/mock-menu.ts | 2 +- .../src/common/test/mock-resource-provider.ts | 2 +- packages/core/src/common/theme.ts | 2 +- packages/core/src/common/types.spec.ts | 2 +- packages/core/src/common/types.ts | 2 +- .../src/common/uri-command-handler.spec.ts | 2 +- .../core/src/common/uri-command-handler.ts | 2 +- packages/core/src/common/uri.spec.ts | 2 +- packages/core/src/common/uri.ts | 2 +- packages/core/src/common/view-column.ts | 2 +- packages/core/src/common/window.ts | 2 +- .../electron-clipboard-service.ts | 2 +- ...lectron-keyboard-layout-change-notifier.ts | 2 +- .../keyboard/electron-keyboard-module.ts | 2 +- .../menu/electron-context-menu-renderer.ts | 2 +- .../menu/electron-main-menu-factory.ts | 2 +- .../menu/electron-menu-contribution.ts | 2 +- .../menu/electron-menu-module.ts | 2 +- .../menu/electron-menu-style.css | 7 +- .../electron-ipc-connection-provider.ts | 2 +- .../electron-messaging-frontend-module.ts | 2 +- .../electron-ws-connection-provider.ts | 2 +- packages/core/src/electron-browser/preload.ts | 2 +- .../electron-browser-request-module.ts | 2 +- .../token/electron-token-frontend-module.ts | 2 +- .../electron-frontend-application-state.ts | 2 +- .../electron-secondary-window-service.ts | 2 +- .../window/electron-window-module.ts | 2 +- .../window/electron-window-preferences.ts | 2 +- .../window/electron-window-service.ts | 2 +- .../core/src/electron-common/electron-api.ts | 2 +- .../electron-main-window-service.ts | 2 +- .../src/electron-common/electron-token.ts | 2 +- .../messaging/electron-connection-handler.ts | 2 +- .../src/electron-main/electron-api-main.ts | 2 +- .../electron-main-application-module.ts | 2 +- .../electron-main-application.ts | 2 +- .../electron-main/electron-main-constants.ts | 2 +- .../electron-main-window-service-impl.ts | 2 +- .../electron-security-token-service.ts | 2 +- .../core/src/electron-main/event-utils.ts | 2 +- .../electron-messaging-contribution.ts | 2 +- .../messaging/electron-messaging-service.ts | 2 +- .../electron-main/theia-electron-window.ts | 2 +- .../electron-backend-hosting-module.ts | 2 +- .../hosting/electron-ws-origin-validator.ts | 2 +- .../electron-backend-keyboard-module.ts | 2 +- .../electron-keyboard-layout-provider.ts | 2 +- .../electron-backend-request-module.ts | 2 +- .../electron-backend-request-service.ts | 2 +- .../electron-token-backend-contribution.ts | 2 +- .../token/electron-token-backend-module.ts | 2 +- .../electron-token-messaging-contribution.ts | 2 +- .../token/electron-token-validator.ts | 2 +- packages/core/src/node/application-server.ts | 2 +- ...ackend-application-config-provider.spec.ts | 2 +- .../backend-application-config-provider.ts | 2 +- .../src/node/backend-application-module.ts | 2 +- packages/core/src/node/backend-application.ts | 2 +- packages/core/src/node/cli.spec.ts | 2 +- packages/core/src/node/cli.ts | 2 +- .../src/node/console-logger-server.spec.ts | 2 +- .../core/src/node/console-logger-server.ts | 2 +- packages/core/src/node/debug.ts | 2 +- packages/core/src/node/dynamic-require.ts | 2 +- .../env-variables/env-variables-server.ts | 2 +- packages/core/src/node/env-variables/index.ts | 2 +- .../core/src/node/environment-utils.spec.ts | 2 +- packages/core/src/node/environment-utils.ts | 2 +- packages/core/src/node/file-uri.spec.ts | 2 +- packages/core/src/node/file-uri.ts | 2 +- packages/core/src/node/filesystem-locking.ts | 2 +- .../node/hosting/backend-application-hosts.ts | 2 +- .../node/hosting/backend-hosting-module.ts | 2 +- .../src/node/hosting/ws-origin-validator.ts | 2 +- .../core/src/node/i18n/i18n-backend-module.ts | 2 +- .../i18n/localization-backend-contribution.ts | 2 +- .../node/i18n/localization-contribution.ts | 2 +- .../src/node/i18n/localization-provider.ts | 2 +- .../i18n/theia-localization-contribution.ts | 2 +- packages/core/src/node/index.ts | 2 +- packages/core/src/node/keytar-server.ts | 2 +- .../core/src/node/logger-backend-module.ts | 12 +- .../src/node/logger-cli-contribution.spec.ts | 2 +- .../core/src/node/logger-cli-contribution.ts | 2 +- packages/core/src/node/main.ts | 2 +- .../src/node/messaging/binary-message-pipe.ts | 2 +- .../messaging/connection-container-module.ts | 2 +- packages/core/src/node/messaging/index.ts | 2 +- .../core/src/node/messaging/ipc-bootstrap.ts | 2 +- .../core/src/node/messaging/ipc-channel.ts | 2 +- .../node/messaging/ipc-connection-provider.ts | 2 +- .../core/src/node/messaging/ipc-protocol.ts | 2 +- .../messaging/messaging-backend-module.ts | 2 +- .../node/messaging/messaging-contribution.ts | 2 +- .../src/node/messaging/messaging-listeners.ts | 2 +- .../src/node/messaging/messaging-service.ts | 2 +- .../messaging/test/test-web-socket-channel.ts | 2 +- .../os-backend-application-contribution.ts | 2 +- packages/core/src/node/performance/index.ts | 2 +- .../measurement-backend-bindings.ts | 2 +- .../src/node/performance/node-stopwatch.ts | 2 +- packages/core/src/node/process-utils.spec.ts | 2 +- packages/core/src/node/process-utils.ts | 2 +- .../node/request/backend-request-facade.ts | 2 +- .../node/request/backend-request-module.ts | 2 +- .../node/request/proxy-cli-contribution.ts | 2 +- .../core/src/node/ws-request-validators.ts | 2 +- packages/core/src/typings/native-keymap.d.ts | 2 +- packages/debug/package.json | 2 +- .../browser/breakpoint/breakpoint-manager.ts | 2 +- .../browser/breakpoint/breakpoint-marker.ts | 2 +- .../console/debug-console-contribution.tsx | 2 +- .../browser/console/debug-console-items.tsx | 2 +- .../browser/console/debug-console-session.ts | 2 +- .../browser/debug-call-stack-item-type-key.ts | 2 +- .../browser/debug-configuration-manager.ts | 2 +- .../src/browser/debug-configuration-model.ts | 2 +- .../debug/src/browser/debug-contribution.ts | 2 +- ...debug-frontend-application-contribution.ts | 2 +- .../src/browser/debug-frontend-module.ts | 2 +- .../src/browser/debug-keybinding-contexts.ts | 2 +- .../debug/src/browser/debug-package.spec.ts | 2 +- .../debug/src/browser/debug-preferences.ts | 2 +- .../src/browser/debug-prefix-configuration.ts | 2 +- packages/debug/src/browser/debug-resource.ts | 2 +- .../debug/src/browser/debug-schema-updater.ts | 2 +- .../src/browser/debug-session-connection.ts | 2 +- .../src/browser/debug-session-contribution.ts | 2 +- .../src/browser/debug-session-manager.ts | 2 +- .../src/browser/debug-session-options.ts | 2 +- packages/debug/src/browser/debug-session.tsx | 2 +- .../src/browser/debug-tab-bar-decorator.ts | 2 +- .../debug/src/browser/debug-watch-manager.ts | 2 +- ...disassembly-view-accessibility-provider.ts | 2 +- .../disassembly-view-breakpoint-renderer.ts | 2 +- .../disassembly-view-contribution.ts | 2 +- .../disassembly-view-instruction-renderer.ts | 2 +- .../disassembly-view-table-delegate.ts | 2 +- .../disassembly-view-utilities.ts | 2 +- .../disassembly-view-widget.ts | 2 +- .../editor/debug-breakpoint-widget.tsx | 2 +- .../src/browser/editor/debug-editor-model.ts | 2 +- .../browser/editor/debug-editor-service.ts | 2 +- .../debug/src/browser/editor/debug-editor.ts | 2 +- .../browser/editor/debug-exception-widget.tsx | 2 +- .../editor/debug-expression-provider.ts | 2 +- .../src/browser/editor/debug-hover-source.tsx | 2 +- .../src/browser/editor/debug-hover-widget.ts | 2 +- .../editor/debug-inline-value-decorator.ts | 2 +- .../src/browser/model/debug-breakpoint.tsx | 2 +- .../model/debug-function-breakpoint.tsx | 2 +- .../model/debug-instruction-breakpoint.tsx | 2 +- .../browser/model/debug-source-breakpoint.tsx | 2 +- .../debug/src/browser/model/debug-source.ts | 2 +- .../src/browser/model/debug-stack-frame.tsx | 2 +- .../debug/src/browser/model/debug-thread.tsx | 2 +- .../browser/preferences/launch-preferences.ts | 2 +- packages/debug/src/browser/style/index.css | 378 +++++----- .../debug/src/browser/view/debug-action.tsx | 2 +- .../browser/view/debug-breakpoints-source.tsx | 2 +- .../browser/view/debug-breakpoints-widget.ts | 2 +- .../view/debug-configuration-select.tsx | 2 +- .../view/debug-configuration-widget.tsx | 2 +- .../view/debug-exception-breakpoint.tsx | 2 +- .../src/browser/view/debug-session-widget.ts | 2 +- .../view/debug-stack-frames-source.tsx | 2 +- .../browser/view/debug-stack-frames-widget.ts | 2 +- .../src/browser/view/debug-threads-source.tsx | 2 +- .../src/browser/view/debug-threads-widget.ts | 2 +- .../src/browser/view/debug-toolbar-widget.tsx | 2 +- .../browser/view/debug-variables-source.ts | 2 +- .../browser/view/debug-variables-widget.ts | 2 +- .../src/browser/view/debug-view-model.ts | 2 +- .../browser/view/debug-watch-expression.tsx | 2 +- .../src/browser/view/debug-watch-source.ts | 2 +- .../src/browser/view/debug-watch-widget.ts | 2 +- .../debug/src/browser/view/debug-widget.ts | 2 +- .../debug-adapter-contribution-registry.ts | 2 +- .../debug/src/common/debug-adapter-session.ts | 2 +- packages/debug/src/common/debug-common.ts | 2 +- packages/debug/src/common/debug-compound.ts | 2 +- .../debug/src/common/debug-configuration.ts | 2 +- packages/debug/src/common/debug-model.ts | 2 +- packages/debug/src/common/debug-service.ts | 2 +- packages/debug/src/common/debug-uri-utils.ts | 2 +- .../debug/src/common/inline-debug-adapter.ts | 2 +- .../debug/src/node/debug-adapter-factory.ts | 2 +- .../src/node/debug-adapter-session-manager.ts | 2 +- .../debug/src/node/debug-backend-module.ts | 2 +- packages/debug/src/node/debug-service-impl.ts | 2 +- .../debug/src/node/stream-debug-adapter.ts | 2 +- .../vscode-debug-adapter-contribution.ts | 2 +- packages/editor-preview/package.json | 2 +- .../browser/editor-preview-contribution.ts | 2 +- .../browser/editor-preview-frontend-module.ts | 2 +- .../src/browser/editor-preview-manager.ts | 2 +- .../src/browser/editor-preview-preferences.ts | 2 +- .../browser/editor-preview-tree-decorator.ts | 2 +- .../browser/editor-preview-widget-factory.ts | 2 +- .../src/browser/editor-preview-widget.ts | 2 +- .../browser/style/editor-preview-widget.css | 4 +- .../src/browser/style/index.css | 4 +- packages/editor-preview/src/package.spec.ts | 2 +- packages/editor/package.json | 2 +- .../decorations/editor-decoration-style.ts | 2 +- .../browser/decorations/editor-decoration.ts | 2 +- .../browser/decorations/editor-decorator.ts | 2 +- .../editor/src/browser/decorations/index.ts | 2 +- packages/editor/src/browser/diff-navigator.ts | 2 +- packages/editor/src/browser/editor-command.ts | 2 +- .../editor/src/browser/editor-contribution.ts | 2 +- .../src/browser/editor-frontend-module.ts | 2 +- .../editor-generated-preference-schema.ts | 2 +- .../src/browser/editor-keybinding-contexts.ts | 2 +- .../editor/src/browser/editor-keybinding.ts | 2 +- packages/editor/src/browser/editor-manager.ts | 2 +- packages/editor/src/browser/editor-menu.ts | 2 +- .../browser/editor-navigation-contribution.ts | 2 +- .../editor/src/browser/editor-preferences.ts | 2 +- .../browser/editor-variable-contribution.ts | 2 +- .../src/browser/editor-widget-factory.ts | 2 +- packages/editor/src/browser/editor-widget.ts | 2 +- packages/editor/src/browser/editor.ts | 2 +- packages/editor/src/browser/index.ts | 2 +- .../editor-language-status-service.ts | 2 +- .../editor-language-status.css | 93 +-- .../navigation-location-service.spec.ts | 2 +- .../navigation/navigation-location-service.ts | 2 +- .../navigation-location-similarity.spec.ts | 2 +- .../navigation-location-similarity.ts | 2 +- .../navigation-location-updater.spec.ts | 2 +- .../navigation/navigation-location-updater.ts | 2 +- .../browser/navigation/navigation-location.ts | 2 +- .../test/mock-navigation-location-updater.ts | 2 +- .../src/browser/quick-editor-service.ts | 2 +- packages/editor/src/browser/style/index.css | 4 +- .../editor/src/common/language-selector.ts | 2 +- packages/editor/src/package.spec.ts | 2 +- packages/electron/index.d.ts | 2 +- packages/electron/index.js | 2 +- packages/electron/package.json | 2 +- packages/external-terminal/package.json | 2 +- .../src/common/external-terminal.ts | 2 +- .../external-terminal-contribution.ts | 2 +- .../external-terminal-frontend-module.ts | 2 +- .../external-terminal-preference.ts | 2 +- .../external-terminal-backend-module.ts | 2 +- .../linux-external-terminal-service.ts | 2 +- .../mac-external-terminal-service.ts | 2 +- .../windows-external-terminal-service.ts | 2 +- .../external-terminal/src/package.spec.ts | 4 +- packages/file-search/package.json | 2 +- .../browser/file-search-frontend-module.ts | 2 +- .../browser/quick-file-open-contribution.ts | 2 +- .../src/browser/quick-file-open.ts | 2 +- .../src/common/file-search-service.ts | 2 +- .../src/node/file-search-backend-module.ts | 2 +- .../src/node/file-search-service-impl.spec.ts | 2 +- .../src/node/file-search-service-impl.ts | 2 +- packages/filesystem/package.json | 2 +- .../breadcrumbs/filepath-breadcrumb.ts | 2 +- .../filepath-breadcrumbs-container.ts | 2 +- .../filepath-breadcrumbs-contribution.ts | 2 +- .../file-download-command-contribution.ts | 2 +- .../download/file-download-frontend-module.ts | 2 +- .../browser/download/file-download-service.ts | 2 +- .../file-dialog/file-dialog-container.ts | 2 +- .../file-dialog-hidden-files-renderer.tsx | 2 +- .../browser/file-dialog/file-dialog-model.ts | 2 +- .../browser/file-dialog/file-dialog-module.ts | 2 +- .../file-dialog/file-dialog-service.ts | 2 +- .../file-dialog-tree-filters-renderer.tsx | 2 +- .../browser/file-dialog/file-dialog-tree.ts | 2 +- .../browser/file-dialog/file-dialog-widget.ts | 2 +- .../src/browser/file-dialog/file-dialog.ts | 2 +- .../src/browser/file-dialog/index.ts | 2 +- .../filesystem/src/browser/file-resource.ts | 2 +- .../filesystem/src/browser/file-selection.ts | 2 +- .../filesystem/src/browser/file-service.ts | 2 +- .../browser/file-tree/file-tree-container.ts | 2 +- .../file-tree/file-tree-decorator-adapter.ts | 2 +- .../file-tree/file-tree-label-provider.ts | 2 +- .../src/browser/file-tree/file-tree-model.ts | 2 +- .../browser/file-tree/file-tree-widget.tsx | 2 +- .../src/browser/file-tree/file-tree.ts | 2 +- .../filesystem/src/browser/file-tree/index.ts | 2 +- .../src/browser/file-upload-service.ts | 2 +- .../filesystem-frontend-contribution.ts | 2 +- .../src/browser/filesystem-frontend-module.ts | 2 +- .../src/browser/filesystem-preferences.ts | 2 +- .../filesystem-save-resource-service.ts | 2 +- .../filesystem-watcher-error-handler.ts | 2 +- packages/filesystem/src/browser/index.ts | 2 +- .../filesystem/src/browser/location/index.ts | 2 +- .../browser/location/location-renderer.tsx | 2 +- .../src/browser/location/location-service.ts | 2 +- .../remote-file-service-contribution.ts | 2 +- .../src/browser/style/file-dialog.css | 181 +++-- .../src/browser/style/file-icons.css | 40 +- .../browser/style/filepath-breadcrumbs.css | 6 +- .../filesystem/src/browser/style/index.css | 10 +- .../common/delegating-file-system-provider.ts | 2 +- .../src/common/download/file-download-data.ts | 2 +- packages/filesystem/src/common/file-upload.ts | 2 +- packages/filesystem/src/common/files.spec.ts | 2 +- packages/filesystem/src/common/files.ts | 2 +- .../src/common/filesystem-utils.spec.ts | 2 +- .../filesystem/src/common/filesystem-utils.ts | 2 +- .../src/common/filesystem-watcher-protocol.ts | 2 +- packages/filesystem/src/common/filesystem.ts | 2 +- packages/filesystem/src/common/index.ts | 2 +- packages/filesystem/src/common/io.ts | 2 +- .../src/common/remote-file-system-provider.ts | 2 +- .../electron-file-dialog-module.ts | 2 +- .../electron-file-dialog-service.ts | 2 +- .../src/electron-browser/preload.ts | 2 +- .../src/electron-common/electron-api.ts | 2 +- .../src/electron-main/electron-api-main.ts | 2 +- .../src/electron-main/electron-main-module.ts | 2 +- .../src/node/disk-file-system-provider.ts | 2 +- .../node/download/directory-archiver.spec.ts | 2 +- .../src/node/download/directory-archiver.ts | 2 +- .../download/file-download-backend-module.ts | 2 +- .../src/node/download/file-download-cache.ts | 2 +- .../node/download/file-download-endpoint.ts | 2 +- .../node/download/file-download-handler.ts | 2 +- .../download/test/mock-directory-archiver.ts | 2 +- .../src/node/file-change-collection.spec.ts | 2 +- .../src/node/file-change-collection.ts | 2 +- .../src/node/filesystem-backend-module.ts | 2 +- .../src/node/filesystem-watcher-client.ts | 2 +- .../src/node/filesystem-watcher-dispatcher.ts | 2 +- .../src/node/node-file-upload-service.ts | 4 +- .../filesystem/src/node/nsfw-watcher/index.ts | 2 +- .../nsfw-watcher/nsfw-filesystem-service.ts | 2 +- .../nsfw-filesystem-watcher.spec.ts | 2 +- .../src/node/nsfw-watcher/nsfw-options.ts | 2 +- .../filesystem/src/typings/dom.webkit.d.ts | 2 +- packages/filesystem/src/typings/mv/index.d.ts | 2 +- .../filesystem/src/typings/nsfw/index.d.ts | 2 +- .../filesystem/src/typings/trash/index.d.ts | 2 +- packages/getting-started/package.json | 2 +- .../browser/getting-started-contribution.ts | 2 +- .../getting-started-frontend-module.ts | 2 +- .../src/browser/getting-started-widget.tsx | 2 +- .../src/browser/style/index.css | 65 +- packages/getting-started/src/package.spec.ts | 2 +- packages/git/package.json | 2 +- .../src/browser/blame/blame-contribution.ts | 2 +- .../git/src/browser/blame/blame-decorator.ts | 2 +- .../git/src/browser/blame/blame-manager.ts | 2 +- .../git/src/browser/blame/blame-module.ts | 2 +- .../src/browser/diff/git-diff-contribution.ts | 2 +- .../browser/diff/git-diff-frontend-module.ts | 2 +- .../browser/diff/git-diff-header-widget.tsx | 2 +- .../src/browser/diff/git-diff-tree-model.tsx | 2 +- .../git/src/browser/diff/git-diff-widget.tsx | 2 +- .../diff/git-opener-in-primary-area.ts | 2 +- .../src/browser/diff/git-resource-opener.ts | 2 +- .../dirty-diff/dirty-diff-contribution.ts | 2 +- .../browser/dirty-diff/dirty-diff-manager.ts | 2 +- .../browser/dirty-diff/dirty-diff-module.ts | 2 +- .../browser/git-commit-message-validator.ts | 2 +- packages/git/src/browser/git-contribution.ts | 2 +- .../src/browser/git-decoration-provider.ts | 2 +- packages/git/src/browser/git-error-handler.ts | 2 +- .../git/src/browser/git-frontend-module.ts | 2 +- packages/git/src/browser/git-preferences.ts | 2 +- .../git/src/browser/git-quick-open-service.ts | 2 +- .../browser/git-repository-provider.spec.ts | 2 +- .../src/browser/git-repository-provider.ts | 2 +- .../git/src/browser/git-repository-tracker.ts | 2 +- .../git/src/browser/git-resource-resolver.ts | 2 +- packages/git/src/browser/git-resource.ts | 2 +- .../git/src/browser/git-scm-provider.spec.ts | 2 +- packages/git/src/browser/git-scm-provider.ts | 2 +- packages/git/src/browser/git-sync-service.ts | 2 +- .../src/browser/git-uri-label-contribution.ts | 2 +- .../git-commit-detail-header-widget.tsx | 2 +- .../history/git-commit-detail-open-handler.ts | 2 +- .../git-commit-detail-widget-options.ts | 2 +- .../history/git-commit-detail-widget.tsx | 2 +- .../history/git-history-frontend-module.ts | 2 +- .../browser/history/git-history-support.ts | 2 +- .../history/git-opener-in-secondary-area.ts | 2 +- .../src/browser/prompt/git-prompt-module.ts | 2 +- packages/git/src/browser/style/diff.css | 72 +- packages/git/src/browser/style/git-icons.css | 14 +- packages/git/src/browser/style/index.css | 24 +- packages/git/src/common/git-model.ts | 2 +- packages/git/src/common/git-prompt.ts | 2 +- packages/git/src/common/git-watcher.ts | 2 +- packages/git/src/common/git.ts | 2 +- packages/git/src/common/index.ts | 2 +- .../prompt/electron-git-prompt-module.ts | 2 +- .../prompt/git-quick-open-prompt.ts | 2 +- .../env/electron-git-env-module.ts | 2 +- .../env/electron-git-env-provider.ts | 2 +- packages/git/src/node/dugite-git-prompt.ts | 2 +- .../src/node/dugite-git-watcher.slow-spec.ts | 2 +- packages/git/src/node/dugite-git-watcher.ts | 2 +- packages/git/src/node/dugite-git.slow-spec.ts | 2 +- packages/git/src/node/dugite-git.spec.ts | 2 +- packages/git/src/node/dugite-git.ts | 2 +- packages/git/src/node/env/git-env-module.ts | 2 +- packages/git/src/node/env/git-env-provider.ts | 2 +- packages/git/src/node/git-backend-module.ts | 2 +- packages/git/src/node/git-exec-provider.ts | 2 +- .../node/git-locator/git-locator-client.ts | 2 +- .../src/node/git-locator/git-locator-host.ts | 2 +- .../src/node/git-locator/git-locator-impl.ts | 2 +- .../node/git-locator/git-locator-protocol.ts | 2 +- .../git/src/node/git-repository-manager.ts | 2 +- .../git/src/node/git-repository-watcher.ts | 2 +- packages/git/src/node/init/git-init.ts | 2 +- packages/git/src/node/test/binding-helper.ts | 2 +- .../node/test/no-sync-repository-manager.ts | 2 +- packages/keymaps/package.json | 2 +- packages/keymaps/src/browser/index.ts | 2 +- .../src/browser/keybinding-schema-updater.ts | 2 +- .../src/browser/keybindings-widget.tsx | 2 +- .../browser/keymaps-frontend-contribution.ts | 2 +- .../src/browser/keymaps-frontend-module.ts | 2 +- .../browser/keymaps-monaco-contribution.ts | 2 +- .../keymaps/src/browser/keymaps-service.ts | 2 +- packages/keymaps/src/browser/style/index.css | 143 ++-- packages/keymaps/src/package.spec.ts | 2 +- packages/markers/package.json | 2 +- packages/markers/src/browser/index.ts | 2 +- .../markers/src/browser/marker-manager.ts | 2 +- .../marker-tree-label-provider.spec.ts | 2 +- .../src/browser/marker-tree-label-provider.ts | 2 +- .../markers/src/browser/marker-tree-model.ts | 2 +- packages/markers/src/browser/marker-tree.ts | 2 +- .../problem-composite-tree-node.spec.ts | 2 +- .../problem/problem-composite-tree-node.ts | 2 +- .../src/browser/problem/problem-container.ts | 2 +- .../browser/problem/problem-contribution.ts | 2 +- .../problem/problem-decorations-provider.ts | 2 +- .../src/browser/problem/problem-decorator.ts | 2 +- .../problem/problem-frontend-module.ts | 2 +- .../problem/problem-layout-migrations.ts | 2 +- .../browser/problem/problem-manager.spec.ts | 2 +- .../src/browser/problem/problem-manager.ts | 2 +- .../browser/problem/problem-preferences.ts | 2 +- .../src/browser/problem/problem-selection.ts | 2 +- .../problem/problem-tabbar-decorator.ts | 2 +- .../problem/problem-tree-model.spec.ts | 2 +- .../src/browser/problem/problem-tree-model.ts | 2 +- .../src/browser/problem/problem-utils.ts | 2 +- .../problem-widget-tab-bar-decorator.ts | 2 +- .../src/browser/problem/problem-widget.tsx | 2 +- packages/markers/src/browser/style/index.css | 64 +- packages/markers/src/common/marker.ts | 2 +- packages/markers/src/common/problem-marker.ts | 2 +- packages/memory-inspector/package.json | 2 +- .../memory-diff-options-widget.tsx | 2 +- .../diff-widget/memory-diff-select-widget.tsx | 2 +- .../diff-widget/memory-diff-table-widget.tsx | 2 +- .../diff-widget/memory-diff-widget-types.ts | 2 +- .../memory-editable-table-widget.tsx | 2 +- .../memory-inspector-frontend-contribution.ts | 2 +- .../memory-inspector-frontend-module.ts | 2 +- .../cdt-gdb-memory-provider.ts | 2 +- .../memory-provider-service.ts | 2 +- .../memory-provider/memory-provider.spec.ts | 2 +- .../memory-provider/memory-provider.ts | 2 +- .../memory-widget/memory-options-widget.tsx | 2 +- .../memory-widget/memory-table-widget.tsx | 2 +- .../browser/memory-widget/memory-widget.ts | 2 +- .../register-filter-service.ts | 2 +- .../register-options-widget.tsx | 2 +- .../register-widget/register-table-widget.tsx | 2 +- .../register-widget/register-widget-types.ts | 2 +- .../register-widget/register-widget.css | 14 +- .../src/browser/style/index.css | 694 +++++++++--------- .../src/browser/style/memory-lock.svg | 2 +- .../src/browser/style/memory-view.svg | 2 +- .../src/browser/style/register-lock.svg | 2 +- .../src/browser/style/register-view.svg | 2 +- .../src/browser/utils/memory-commands.ts | 2 +- .../browser/utils/memory-hover-renderer.ts | 2 +- .../src/browser/utils/memory-recents.ts | 2 +- .../utils/memory-widget-components.tsx | 2 +- .../browser/utils/memory-widget-manager.ts | 2 +- .../src/browser/utils/memory-widget-utils.tsx | 2 +- .../utils/memory-widget-variable-utils.ts | 2 +- .../src/browser/utils/multi-select-bar.css | 65 +- .../src/browser/utils/multi-select-bar.tsx | 2 +- .../wrapper-widgets/memory-dock-panel.ts | 2 +- .../memory-dockpanel-placeholder-widget.tsx | 2 +- .../wrapper-widgets/memory-layout-widget.tsx | 2 +- packages/memory-inspector/src/common/util.ts | 2 +- .../memory-inspector/src/common/utils.spec.ts | 2 +- packages/messages/package.json | 2 +- .../src/browser/messages-frontend-module.ts | 2 +- .../browser/notification-center-component.tsx | 2 +- .../src/browser/notification-component.tsx | 2 +- .../notification-content-renderer.spec.ts | 2 +- .../browser/notification-content-renderer.ts | 2 +- .../src/browser/notification-preferences.ts | 2 +- .../browser/notification-toasts-component.tsx | 2 +- .../src/browser/notifications-commands.ts | 2 +- .../src/browser/notifications-contribution.ts | 2 +- .../src/browser/notifications-manager.ts | 2 +- .../src/browser/notifications-renderer.tsx | 2 +- packages/messages/src/browser/style/index.css | 4 +- .../src/browser/style/notifications.css | 267 +++---- packages/metrics/package.json | 2 +- .../node/extensions-metrics-contribution.ts | 2 +- packages/metrics/src/node/index.ts | 2 +- ...etrics-backend-application-contribution.ts | 2 +- .../src/node/metrics-backend-module.ts | 2 +- .../metrics/src/node/metrics-contribution.ts | 2 +- .../src/node/node-metrics-contribution.ts | 2 +- packages/metrics/src/node/prometheus.spec.ts | 2 +- packages/metrics/src/node/prometheus.ts | 2 +- packages/mini-browser/package.json | 2 +- .../mini-browser-environment-module.ts | 2 +- .../environment/mini-browser-environment.ts | 2 +- .../src/browser/location-mapper-service.ts | 2 +- .../src/browser/mini-browser-content-style.ts | 2 +- .../src/browser/mini-browser-content.ts | 2 +- .../browser/mini-browser-frontend-module.ts | 2 +- ...mini-browser-frontend-security-warnings.ts | 2 +- .../src/browser/mini-browser-open-handler.ts | 2 +- .../mini-browser/src/browser/mini-browser.ts | 2 +- .../mini-browser/src/browser/pdfobject.d.ts | 2 +- .../mini-browser/src/browser/style/index.css | 158 ++-- .../src/common/mini-browser-endpoint.ts | 2 +- .../src/common/mini-browser-service.ts | 2 +- ...lectron-mini-browser-environment-module.ts | 2 +- .../electron-mini-browser-environment.ts | 2 +- ...mini-browser-electron-main-contribution.ts | 2 +- .../src/node/mini-browser-backend-module.ts | 2 +- .../mini-browser-backend-security-warnings.ts | 2 +- .../src/node/mini-browser-endpoint.ts | 2 +- .../src/node/mini-browser-ws-validator.ts | 2 +- packages/mini-browser/src/package.spec.ts | 2 +- packages/monaco/package.json | 2 +- packages/monaco/src/browser/index.ts | 2 +- .../monaco-markdown-renderer.ts | 2 +- .../src/browser/monaco-bulk-edit-service.ts | 2 +- .../src/browser/monaco-color-registry.ts | 2 +- .../src/browser/monaco-command-registry.ts | 2 +- .../src/browser/monaco-command-service.ts | 2 +- packages/monaco/src/browser/monaco-command.ts | 2 +- .../src/browser/monaco-context-key-service.ts | 2 +- .../monaco/src/browser/monaco-context-menu.ts | 2 +- .../monaco/src/browser/monaco-diff-editor.ts | 2 +- .../browser/monaco-diff-navigator-factory.ts | 2 +- .../monaco/src/browser/monaco-editor-model.ts | 2 +- .../src/browser/monaco-editor-provider.ts | 2 +- .../src/browser/monaco-editor-service.ts | 2 +- .../src/browser/monaco-editor-zone-widget.ts | 2 +- packages/monaco/src/browser/monaco-editor.ts | 2 +- .../browser/monaco-formatting-conflicts.ts | 2 +- ...onaco-frontend-application-contribution.ts | 2 +- .../src/browser/monaco-frontend-module.ts | 2 +- .../browser/monaco-gotoline-quick-access.ts | 2 +- .../browser/monaco-gotosymbol-quick-access.ts | 2 +- .../monaco/src/browser/monaco-indexed-db.ts | 2 +- .../src/browser/monaco-keybinding-contexts.ts | 2 +- .../monaco/src/browser/monaco-keybinding.ts | 2 +- .../monaco/src/browser/monaco-keycode-map.ts | 2 +- .../monaco/src/browser/monaco-languages.ts | 2 +- .../src/browser/monaco-marker-collection.ts | 2 +- packages/monaco/src/browser/monaco-menu.ts | 2 +- .../monaco/src/browser/monaco-mime-service.ts | 2 +- .../browser/monaco-outline-contribution.ts | 2 +- .../src/browser/monaco-outline-decorator.ts | 2 +- .../browser/monaco-quick-access-registry.ts | 2 +- .../src/browser/monaco-quick-input-service.ts | 2 +- .../src/browser/monaco-resolved-keybinding.ts | 2 +- .../monaco-snippet-suggest-provider.ts | 2 +- .../browser/monaco-status-bar-contribution.ts | 2 +- .../src/browser/monaco-text-model-service.ts | 2 +- .../src/browser/monaco-theming-service.ts | 2 +- .../browser/monaco-to-protocol-converter.ts | 2 +- .../monaco/src/browser/monaco-workspace.ts | 2 +- .../browser/protocol-to-monaco-converter.ts | 2 +- packages/monaco/src/browser/textmate/index.ts | 2 +- .../monaco-textmate-frontend-bindings.ts | 2 +- .../textmate/monaco-textmate-service.ts | 2 +- .../browser/textmate/monaco-theme-registry.ts | 2 +- .../browser/textmate/monaco-theme-types.ts | 2 +- .../browser/textmate/textmate-contribution.ts | 2 +- .../src/browser/textmate/textmate-registry.ts | 2 +- .../textmate-snippet-completion-provider.ts | 2 +- .../browser/textmate/textmate-tokenizer.ts | 2 +- .../src/browser/workspace-symbol-command.ts | 2 +- packages/monaco/src/package.spec.ts | 2 +- packages/navigator/package.json | 2 +- .../browser/abstract-navigator-tree-widget.ts | 2 +- .../src/browser/file-navigator-commands.ts | 2 +- packages/navigator/src/browser/index.ts | 2 +- .../src/browser/navigator-container.ts | 2 +- .../browser/navigator-context-key-service.ts | 2 +- .../src/browser/navigator-contribution.ts | 2 +- .../browser/navigator-decorator-service.ts | 2 +- .../src/browser/navigator-diff.spec.ts | 2 +- .../navigator/src/browser/navigator-diff.ts | 2 +- .../src/browser/navigator-filter.spec.ts | 2 +- .../navigator/src/browser/navigator-filter.ts | 2 +- .../src/browser/navigator-frontend-module.ts | 2 +- .../browser/navigator-keybinding-context.ts | 2 +- .../browser/navigator-layout-migrations.ts | 2 +- .../navigator/src/browser/navigator-model.ts | 2 +- .../src/browser/navigator-preferences.ts | 2 +- .../browser/navigator-symlink-decorator.ts | 2 +- .../browser/navigator-tab-bar-decorator.ts | 2 +- .../navigator/src/browser/navigator-tree.ts | 2 +- .../src/browser/navigator-widget-factory.ts | 2 +- .../src/browser/navigator-widget.tsx | 2 +- .../navigator-deleted-editor-decorator.ts | 2 +- .../navigator-open-editors-commands.ts | 2 +- ...avigator-open-editors-decorator-service.ts | 2 +- .../navigator-open-editors-menus.ts | 2 +- .../navigator-open-editors-tree-model.ts | 2 +- .../navigator-open-editors-widget.tsx | 2 +- .../open-editors-widget/open-editors.css | 89 ++- .../navigator/src/browser/style/index.css | 28 +- .../electron-navigator-menu-contribution.ts | 2 +- .../electron-navigator-module.ts | 2 +- packages/navigator/src/package.spec.ts | 2 +- packages/outline-view/package.json | 2 +- packages/outline-view/src/browser/index.ts | 2 +- .../outline-breadcrumbs-contribution.tsx | 2 +- .../src/browser/outline-decorator-service.ts | 2 +- .../src/browser/outline-view-contribution.ts | 2 +- .../browser/outline-view-frontend-module.ts | 2 +- .../src/browser/outline-view-service.ts | 2 +- .../src/browser/outline-view-tree-model.ts | 2 +- .../src/browser/outline-view-widget.tsx | 2 +- .../outline-view/src/browser/styles/index.css | 8 +- packages/outline-view/src/package.spec.ts | 2 +- packages/output/package.json | 2 +- packages/output/src/browser/output-channel.ts | 2 +- .../output/src/browser/output-commands.ts | 2 +- .../output/src/browser/output-context-menu.ts | 2 +- .../output/src/browser/output-contribution.ts | 2 +- .../src/browser/output-editor-factory.ts | 2 +- .../browser/output-editor-model-factory.ts | 2 +- .../src/browser/output-frontend-module.ts | 2 +- .../output/src/browser/output-preferences.ts | 2 +- .../output/src/browser/output-resource.ts | 2 +- .../browser/output-toolbar-contribution.tsx | 2 +- packages/output/src/browser/output-widget.ts | 2 +- packages/output/src/browser/style/output.css | 10 +- packages/output/src/common/output-uri.spec.ts | 2 +- packages/output/src/common/output-uri.ts | 2 +- packages/plugin-dev/package.json | 2 +- .../src/browser/hosted-plugin-controller.ts | 2 +- .../hosted-plugin-frontend-contribution.ts | 2 +- .../src/browser/hosted-plugin-informer.ts | 2 +- .../src/browser/hosted-plugin-log-viewer.ts | 2 +- .../browser/hosted-plugin-manager-client.ts | 2 +- .../src/browser/hosted-plugin-preferences.ts | 2 +- .../src/browser/plugin-dev-frontend-module.ts | 2 +- packages/plugin-dev/src/common/index.ts | 2 +- .../src/common/plugin-dev-protocol.ts | 2 +- .../plugin-dev-electron-backend-module.ts | 2 +- .../src/node/hosted-instance-manager.ts | 2 +- .../src/node/hosted-plugin-reader.ts | 2 +- .../node/hosted-plugin-uri-postprocessor.ts | 2 +- .../src/node/hosted-plugins-manager.ts | 2 +- .../src/node/plugin-dev-backend-module.ts | 2 +- .../plugin-dev/src/node/plugin-dev-service.ts | 2 +- packages/plugin-dev/src/package.spec.ts | 2 +- packages/plugin-ext-vscode/package.json | 2 +- .../plugin-vscode-commands-contribution.ts | 2 +- .../src/browser/plugin-vscode-contribution.ts | 2 +- .../browser/plugin-vscode-frontend-module.ts | 2 +- .../src/common/plugin-vscode-environment.ts | 2 +- .../src/common/plugin-vscode-types.ts | 2 +- .../src/common/plugin-vscode-uri.ts | 2 +- .../src/node/context/plugin-vscode-init-fe.ts | 2 +- ...ocal-vsix-file-plugin-deployer-resolver.ts | 2 +- .../src/node/package.spec.ts | 2 +- .../src/node/plugin-reader.ts | 2 +- .../src/node/plugin-vscode-backend-module.ts | 2 +- .../node/plugin-vscode-cli-contribution.ts | 2 +- .../plugin-vscode-deployer-participant.ts | 2 +- .../node/plugin-vscode-directory-handler.ts | 2 +- .../src/node/plugin-vscode-file-handler.ts | 2 +- .../src/node/plugin-vscode-init.ts | 2 +- .../src/node/scanner-vscode.ts | 2 +- packages/plugin-ext/package.json | 2 +- packages/plugin-ext/src/common/arrays.ts | 2 +- packages/plugin-ext/src/common/assert.ts | 2 +- packages/plugin-ext/src/common/cache.ts | 2 +- .../src/common/character-classifier.ts | 2 +- packages/plugin-ext/src/common/collections.ts | 2 +- packages/plugin-ext/src/common/connection.ts | 2 +- .../plugin-ext/src/common/disposable-util.ts | 2 +- .../plugin-ext/src/common/editor-options.ts | 2 +- packages/plugin-ext/src/common/env.ts | 2 +- packages/plugin-ext/src/common/errors.ts | 2 +- .../plugin-ext/src/common/id-generator.ts | 2 +- packages/plugin-ext/src/common/index.ts | 2 +- .../src/common/language-pack-service.ts | 2 +- .../plugin-ext/src/common/link-computer.ts | 2 +- .../src/common/object-identifier.ts | 2 +- packages/plugin-ext/src/common/paths-util.ts | 2 +- .../src/common/plugin-api-rpc-model.ts | 2 +- .../plugin-ext/src/common/plugin-api-rpc.ts | 2 +- .../src/common/plugin-ext-api-contribution.ts | 2 +- .../src/common/plugin-identifiers.ts | 2 +- .../plugin-ext/src/common/plugin-protocol.ts | 2 +- .../plugin-ext/src/common/proxy-handler.ts | 2 +- .../plugin-ext/src/common/reference-map.ts | 2 +- .../plugin-ext/src/common/rpc-protocol.ts | 2 +- .../src/common/semantic-tokens-dto.ts | 2 +- packages/plugin-ext/src/common/types.ts | 2 +- packages/plugin-ext/src/common/uint.ts | 2 +- .../plugin-ext/src/common/uri-components.ts | 2 +- .../hosted/browser/hosted-plugin-watcher.ts | 2 +- .../src/hosted/browser/hosted-plugin.ts | 2 +- .../src/hosted/browser/plugin-worker.ts | 2 +- .../src/hosted/browser/worker/debug-stub.ts | 2 +- .../browser/worker/plugin-manifest-loader.ts | 2 +- .../hosted/browser/worker/worker-env-ext.ts | 2 +- .../src/hosted/browser/worker/worker-main.ts | 2 +- ...ugin-ext-hosted-electron-backend-module.ts | 2 +- .../node-electron/scanner-theia-electron.ts | 2 +- .../node/hosted-plugin-cli-contribution.ts | 2 +- .../node/hosted-plugin-deployer-handler.ts | 2 +- .../hosted-plugin-localization-service.ts | 2 +- .../src/hosted/node/hosted-plugin-process.ts | 2 +- .../src/hosted/node/hosted-plugin-protocol.ts | 2 +- .../src/hosted/node/hosted-plugin.ts | 2 +- .../src/hosted/node/metadata-scanner.ts | 2 +- .../hosted/node/plugin-activation-events.ts | 2 +- .../node/plugin-ext-hosted-backend-module.ts | 2 +- .../src/hosted/node/plugin-host-proxy.ts | 2 +- .../src/hosted/node/plugin-host-rpc.ts | 2 +- .../plugin-ext/src/hosted/node/plugin-host.ts | 2 +- .../node/plugin-language-pack-service.ts | 2 +- .../src/hosted/node/plugin-manifest-loader.ts | 2 +- .../src/hosted/node/plugin-reader.ts | 2 +- .../src/hosted/node/plugin-service.ts | 2 +- .../node/scanners/backend-init-theia.ts | 2 +- .../node/scanners/file-plugin-uri-factory.ts | 2 +- .../hosted/node/scanners/grammars-reader.ts | 2 +- .../node/scanners/plugin-uri-factory.ts | 2 +- .../src/hosted/node/scanners/scanner-theia.ts | 2 +- .../src/main/browser/authentication-main.ts | 2 +- .../src/main/browser/clipboard-main.ts | 2 +- .../src/main/browser/command-registry-main.ts | 2 +- .../plugin-ext/src/main/browser/commands.ts | 2 +- .../browser/comments/comment-glyph-widget.ts | 2 +- .../comments/comment-thread-widget.tsx | 2 +- .../comments/comments-context-key-service.ts | 2 +- .../browser/comments/comments-contribution.ts | 2 +- .../browser/comments/comments-decorator.ts | 2 +- .../main/browser/comments/comments-main.ts | 2 +- .../main/browser/comments/comments-service.ts | 2 +- .../custom-editor-contribution.ts | 2 +- .../custom-editors/custom-editor-opener.tsx | 2 +- .../custom-editors/custom-editor-service.ts | 2 +- .../custom-editor-widget-factory.ts | 2 +- .../custom-editors/custom-editor-widget.ts | 2 +- .../custom-editors/custom-editors-main.ts | 2 +- .../plugin-custom-editor-registry.ts | 2 +- .../custom-editors/undo-redo-service.ts | 2 +- .../data-transfer-type-converters.ts | 2 +- .../src/main/browser/debug/debug-main.ts | 2 +- .../plugin-debug-adapter-contribution.ts | 2 +- .../plugin-debug-configuration-provider.ts | 2 +- .../browser/debug/plugin-debug-service.ts | 2 +- ...gin-debug-session-contribution-registry.ts | 2 +- .../debug/plugin-debug-session-factory.ts | 2 +- .../browser/decorations/decorations-main.ts | 2 +- .../src/main/browser/dialogs-main.ts | 2 +- .../browser/dialogs/modal-notification.ts | 2 +- .../dialogs/style/modal-notification.css | 142 ++-- .../src/main/browser/documents-main.ts | 2 +- .../browser/editors-and-documents-main.ts | 2 +- .../plugin-ext/src/main/browser/env-main.ts | 2 +- .../src/main/browser/file-system-main-impl.ts | 2 +- .../hierarchy/hierarchy-types-converters.ts | 2 +- .../keybindings-contribution-handler.ts | 2 +- .../src/main/browser/label-service-main.ts | 2 +- .../src/main/browser/languages-main.ts | 2 +- .../src/main/browser/localization-main.ts | 2 +- .../src/main/browser/main-context.ts | 2 +- .../browser/main-file-system-event-service.ts | 2 +- .../menus/menus-contribution-handler.ts | 2 +- .../menus/plugin-menu-command-adapter.ts | 2 +- .../menus/vscode-theia-menu-mappings.ts | 2 +- .../src/main/browser/message-registry-main.ts | 2 +- .../src/main/browser/notification-main.ts | 2 +- .../browser/output-channel-registry-main.ts | 2 +- .../browser/plugin-authentication-service.ts | 2 +- .../browser/plugin-contribution-handler.ts | 2 +- .../browser/plugin-ext-frontend-module.ts | 2 +- .../src/main/browser/plugin-ext-widget.tsx | 2 +- .../browser/plugin-frontend-contribution.ts | 2 +- .../plugin-frontend-view-contribution.ts | 2 +- .../main/browser/plugin-icon-theme-service.ts | 2 +- .../src/main/browser/plugin-shared-style.ts | 2 +- .../src/main/browser/plugin-storage.ts | 2 +- .../main/browser/plugin-terminal-registry.ts | 2 +- .../main/browser/preference-registry-main.ts | 2 +- .../src/main/browser/quick-open-main.ts | 2 +- .../plugin-ext/src/main/browser/scm-main.ts | 2 +- .../src/main/browser/secrets-main.ts | 2 +- .../browser/selection-provider-command.ts | 2 +- .../status-bar-message-registry-main.ts | 2 +- .../src/main/browser/style/index.css | 53 +- .../src/main/browser/style/plugin-sidebar.css | 52 +- .../src/main/browser/style/tree.css | 40 +- .../src/main/browser/style/webview.css | 44 +- .../src/main/browser/tabs/tabs-main.ts | 2 +- .../plugin-ext/src/main/browser/tasks-main.ts | 2 +- .../src/main/browser/terminal-main.ts | 2 +- .../src/main/browser/text-editor-main.ts | 2 +- .../main/browser/text-editor-model-service.ts | 2 +- .../src/main/browser/text-editors-main.ts | 2 +- .../src/main/browser/theme-icon-override.ts | 2 +- .../src/main/browser/theming-main.ts | 2 +- .../src/main/browser/timeline-main.ts | 2 +- .../src/main/browser/view-column-service.ts | 2 +- .../browser/view/dnd-file-content-store.ts | 2 +- .../plugin-tree-view-node-label-provider.ts | 2 +- .../main/browser/view/plugin-view-registry.ts | 2 +- .../main/browser/view/plugin-view-widget.ts | 2 +- .../view/tree-view-decorator-service.ts | 2 +- .../main/browser/view/tree-view-widget.tsx | 2 +- .../src/main/browser/view/tree-views-main.ts | 2 +- .../browser/view/view-context-key-service.ts | 2 +- .../webview-views/webview-views-main.ts | 2 +- .../browser/webview-views/webview-views.ts | 2 +- .../src/main/browser/webview/pre/host.js | 2 +- .../src/main/browser/webview/pre/main.js | 2 +- .../browser/webview/pre/service-worker.js | 44 +- .../browser/webview/webview-context-keys.ts | 2 +- .../browser/webview/webview-environment.ts | 2 +- .../webview-frontend-security-warnings.ts | 2 +- .../browser/webview/webview-preferences.ts | 2 +- .../browser/webview/webview-resource-cache.ts | 2 +- .../webview/webview-theme-data-provider.ts | 2 +- .../browser/webview/webview-widget-factory.ts | 2 +- .../src/main/browser/webview/webview.ts | 2 +- .../src/main/browser/webviews-main.ts | 2 +- .../src/main/browser/window-state-main.ts | 2 +- .../src/main/browser/workspace-main.ts | 2 +- .../src/main/common/plugin-paths-protocol.ts | 2 +- .../main/common/plugin-theia-environment.ts | 2 +- .../src/main/common/webview-protocol.ts | 2 +- .../plugin-ext-frontend-electron-module.ts | 2 +- .../electron-webview-widget-factory.ts | 2 +- .../plugin-theia-directory-handler.ts | 2 +- .../handlers/plugin-theia-file-handler.ts | 2 +- .../plugin-ext/src/main/node/paths/const.ts | 2 +- .../main/node/paths/plugin-paths-service.ts | 2 +- .../src/main/node/plugin-cli-contribution.ts | 2 +- .../main/node/plugin-deployer-contribution.ts | 2 +- ...deployer-directory-handler-context-impl.ts | 2 +- .../main/node/plugin-deployer-entry-impl.ts | 2 +- ...ugin-deployer-file-handler-context-impl.ts | 2 +- .../src/main/node/plugin-deployer-impl.ts | 2 +- .../node/plugin-deployer-proxy-entry-impl.ts | 2 +- .../plugin-deployer-resolver-context-impl.ts | 2 +- .../main/node/plugin-ext-backend-module.ts | 2 +- .../src/main/node/plugin-github-resolver.ts | 2 +- .../src/main/node/plugin-http-resolver.ts | 2 +- ...lugin-localization-backend-contribution.ts | 2 +- .../src/main/node/plugin-server-handler.ts | 2 +- .../src/main/node/plugin-service.ts | 2 +- .../node/plugin-theia-deployer-participant.ts | 2 +- .../node/plugin-uninstallation-manager.ts | 2 +- .../node/plugins-key-value-storage.spec.ts | 2 +- .../main/node/plugins-key-value-storage.ts | 2 +- ...ocal-directory-plugin-deployer-resolver.ts | 2 +- .../local-plugin-deployer-resolver.ts | 2 +- .../plugin-ext/src/main/node/temp-dir-util.ts | 2 +- .../node/webview-backend-security-warnings.ts | 2 +- .../plugin-ext/src/main/style/status-bar.css | 12 +- .../src/plugin-ext-backend-electron-module.ts | 2 +- .../src/plugin-ext-backend-module.ts | 2 +- .../plugin-ext-frontend-electron-module.ts | 2 +- .../src/plugin-ext-frontend-module.ts | 2 +- .../src/plugin/authentication-ext.ts | 2 +- .../plugin-ext/src/plugin/clipboard-ext.ts | 2 +- .../plugin-ext/src/plugin/command-registry.ts | 2 +- packages/plugin-ext/src/plugin/comments.ts | 2 +- .../plugin-ext/src/plugin/custom-editors.ts | 2 +- .../plugin-ext/src/plugin/debug/debug-ext.ts | 2 +- .../debug/plugin-debug-adapter-creator.ts | 2 +- .../debug/plugin-debug-adapter-session.ts | 2 +- .../debug/plugin-debug-adapter-tracker.ts | 2 +- packages/plugin-ext/src/plugin/decorations.ts | 2 +- packages/plugin-ext/src/plugin/dialogs.ts | 2 +- .../plugin-ext/src/plugin/document-data.ts | 2 +- packages/plugin-ext/src/plugin/documents.ts | 2 +- .../src/plugin/editors-and-documents.ts | 2 +- packages/plugin-ext/src/plugin/env.ts | 2 +- .../file-system-event-service-ext-impl.ts | 2 +- .../src/plugin/file-system-ext-impl.ts | 2 +- .../src/plugin/known-commands.spec.ts | 2 +- .../plugin-ext/src/plugin/known-commands.ts | 2 +- .../plugin-ext/src/plugin/label-service.ts | 2 +- .../plugin-ext/src/plugin/languages-utils.ts | 2 +- packages/plugin-ext/src/plugin/languages.ts | 2 +- .../src/plugin/languages/call-hierarchy.ts | 2 +- .../src/plugin/languages/code-action.ts | 2 +- .../plugin-ext/src/plugin/languages/color.ts | 2 +- .../src/plugin/languages/completion.ts | 2 +- .../src/plugin/languages/declaration.ts | 2 +- .../src/plugin/languages/definition.ts | 2 +- .../src/plugin/languages/diagnostics.ts | 2 +- .../plugin/languages/document-drop-edit.ts | 2 +- .../plugin/languages/document-formatting.ts | 2 +- .../plugin/languages/document-highlight.ts | 2 +- .../languages/evaluatable-expression.ts | 2 +- .../src/plugin/languages/folding.ts | 2 +- .../plugin-ext/src/plugin/languages/hover.ts | 2 +- .../src/plugin/languages/implementation.ts | 2 +- .../src/plugin/languages/inlay-hints.ts | 2 +- .../src/plugin/languages/inline-completion.ts | 2 +- .../src/plugin/languages/inline-values.ts | 2 +- .../plugin-ext/src/plugin/languages/lens.ts | 2 +- .../src/plugin/languages/link-provider.ts | 2 +- .../plugin/languages/linked-editing-range.ts | 2 +- .../plugin/languages/on-type-formatting.ts | 2 +- .../src/plugin/languages/outline.ts | 2 +- .../src/plugin/languages/range-formatting.ts | 2 +- .../src/plugin/languages/reference.ts | 2 +- .../plugin-ext/src/plugin/languages/rename.ts | 2 +- .../src/plugin/languages/selection-range.ts | 2 +- .../plugin/languages/semantic-highlighting.ts | 2 +- .../src/plugin/languages/signature.ts | 2 +- .../src/plugin/languages/type-definition.ts | 2 +- .../src/plugin/languages/type-hierarchy.ts | 2 +- .../plugin-ext/src/plugin/languages/util.ts | 2 +- .../src/plugin/languages/workspace-symbol.ts | 2 +- .../plugin-ext/src/plugin/localization-ext.ts | 2 +- .../plugin-ext/src/plugin/markdown-string.ts | 2 +- .../plugin-ext/src/plugin/message-registry.ts | 2 +- .../src/plugin/node/debug/debug.spec.ts | 2 +- .../plugin-node-debug-adapter-creator.ts | 2 +- .../src/plugin/node/env-node-ext.ts | 2 +- .../plugin-ext/src/plugin/notification.ts | 4 +- .../src/plugin/output-channel-registry.ts | 2 +- .../output-channel/log-output-channel.ts | 2 +- .../output-channel/output-channel-item.ts | 2 +- packages/plugin-ext/src/plugin/path.spec.ts | 2 +- packages/plugin-ext/src/plugin/path.ts | 2 +- .../plugin-ext/src/plugin/plugin-context.ts | 2 +- .../plugin-ext/src/plugin/plugin-icon-path.ts | 2 +- .../plugin-ext/src/plugin/plugin-manager.ts | 2 +- .../plugin-ext/src/plugin/plugin-storage.ts | 2 +- .../src/plugin/preference-registry.spec.ts | 2 +- .../src/plugin/preference-registry.ts | 2 +- .../src/plugin/prefix-sum-computer.ts | 2 +- packages/plugin-ext/src/plugin/quick-open.ts | 2 +- packages/plugin-ext/src/plugin/scm.ts | 2 +- packages/plugin-ext/src/plugin/secrets-ext.ts | 2 +- .../src/plugin/status-bar-message-registry.ts | 2 +- .../src/plugin/status-bar/status-bar-item.ts | 2 +- .../plugin-ext/src/plugin/stubs/tests-api.ts | 2 +- packages/plugin-ext/src/plugin/tabs.ts | 2 +- .../src/plugin/tasks/task-provider.ts | 2 +- packages/plugin-ext/src/plugin/tasks/tasks.ts | 2 +- .../plugin-ext/src/plugin/telemetry-ext.ts | 2 +- .../plugin-ext/src/plugin/terminal-ext.ts | 2 +- packages/plugin-ext/src/plugin/text-editor.ts | 2 +- .../plugin-ext/src/plugin/text-editors.ts | 2 +- packages/plugin-ext/src/plugin/theming.ts | 2 +- packages/plugin-ext/src/plugin/timeline.ts | 2 +- .../plugin-ext/src/plugin/tree/tree-views.ts | 2 +- .../src/plugin/type-converters.spec.ts | 2 +- .../plugin-ext/src/plugin/type-converters.ts | 2 +- .../plugin-ext/src/plugin/types-impl.spec.ts | 2 +- packages/plugin-ext/src/plugin/types-impl.ts | 2 +- .../plugin-ext/src/plugin/webview-views.ts | 2 +- packages/plugin-ext/src/plugin/webviews.ts | 2 +- .../plugin-ext/src/plugin/window-state.ts | 2 +- packages/plugin-ext/src/plugin/word-helper.ts | 2 +- packages/plugin-ext/src/plugin/workspace.ts | 2 +- packages/plugin-ext/src/typings/index.d.ts | 2 +- packages/plugin-metrics/package.json | 2 +- .../src/browser/plugin-metrics-creator.ts | 2 +- .../browser/plugin-metrics-frontend-module.ts | 2 +- .../browser/plugin-metrics-languages-main.ts | 2 +- .../browser/plugin-metrics-output-registry.ts | 2 +- .../src/browser/plugin-metrics-resolver.ts | 2 +- .../src/common/metrics-protocol.ts | 2 +- .../src/common/plugin-metrics-types.ts | 2 +- .../plugin-metrics-time-count.ts | 2 +- .../metric-output/plugin-metrics-time-sum.ts | 2 +- .../src/node/metric-string-generator.ts | 2 +- .../src/node/metrics-contributor.spec.ts | 2 +- .../src/node/metrics-contributor.ts | 2 +- .../src/node/plugin-metrics-backend-module.ts | 2 +- .../src/node/plugin-metrics-impl.ts | 2 +- .../plugin-metrics/src/node/plugin-metrics.ts | 2 +- packages/plugin/package.json | 2 +- packages/plugin/src/package.spec.ts | 2 +- packages/plugin/src/theia-extra.d.ts | 2 +- packages/plugin/src/theia-proposed.d.ts | 2 +- packages/plugin/src/theia.d.ts | 2 +- .../src/theia.proposed.externalUriOpener.d.ts | 2 +- ....proposed.editSessionIdentityProvider.d.ts | 2 +- packages/preferences/package.json | 2 +- ...tract-resource-preference-provider.spec.ts | 2 +- .../abstract-resource-preference-provider.ts | 2 +- .../src/browser/folder-preference-provider.ts | 2 +- .../browser/folders-preferences-provider.ts | 2 +- packages/preferences/src/browser/index.ts | 2 +- .../src/browser/monaco-jsonc-editor.ts | 2 +- .../preferences/src/browser/package.spec.ts | 2 +- .../src/browser/preference-bindings.ts | 2 +- .../src/browser/preference-frontend-module.ts | 2 +- .../src/browser/preference-open-handler.ts | 2 +- .../browser/preference-transaction-manager.ts | 2 +- .../src/browser/preference-tree-model.ts | 2 +- .../src/browser/preferences-contribution.ts | 2 +- .../preferences-json-schema-contribution.ts | 2 +- .../preferences-monaco-contribution.ts | 2 +- .../browser/section-preference-provider.ts | 2 +- .../preferences/src/browser/style/index.css | 498 +++++++------ .../src/browser/style/preference-array.css | 72 +- .../browser/style/preference-context-menu.css | 2 +- .../src/browser/style/preference-file.css | 2 +- .../src/browser/style/preference-object.css | 2 +- .../src/browser/style/search-input.css | 4 +- .../user-configs-preference-provider.ts | 2 +- .../src/browser/user-preference-provider.ts | 2 +- .../util/preference-scope-command-manager.ts | 2 +- .../browser/util/preference-tree-generator.ts | 2 +- .../preference-tree-label-provider.spec.ts | 2 +- .../util/preference-tree-label-provider.ts | 2 +- .../src/browser/util/preference-types.ts | 2 +- .../components/preference-array-input.ts | 2 +- .../components/preference-boolean-input.ts | 2 +- .../views/components/preference-file-input.ts | 2 +- .../views/components/preference-json-input.ts | 2 +- .../preference-node-renderer-creator.ts | 2 +- .../components/preference-node-renderer.ts | 2 +- .../components/preference-number-input.ts | 2 +- .../components/preference-select-input.ts | 2 +- .../components/preference-string-input.ts | 2 +- .../browser/views/preference-editor-widget.ts | 2 +- .../views/preference-scope-tabbar-widget.tsx | 2 +- .../views/preference-searchbar-widget.tsx | 2 +- .../browser/views/preference-tree-widget.tsx | 2 +- .../views/preference-widget-bindings.ts | 2 +- .../src/browser/views/preference-widget.tsx | 2 +- .../workspace-file-preference-provider.ts | 2 +- .../browser/workspace-preference-provider.ts | 2 +- packages/preview/package.json | 2 +- packages/preview/src/browser/index.ts | 2 +- .../preview/src/browser/markdown/index.ts | 2 +- .../markdown/markdown-preview-handler.spec.ts | 2 +- .../markdown/markdown-preview-handler.ts | 2 +- .../src/browser/markdown/style/index.css | 6 +- .../src/browser/markdown/style/markdown.css | 132 ++-- .../src/browser/markdown/style/tomorrow.css | 28 +- .../src/browser/preview-contribution.ts | 2 +- .../src/browser/preview-frontend-module.ts | 2 +- .../preview/src/browser/preview-handler.ts | 2 +- .../src/browser/preview-link-normalizer.ts | 2 +- .../src/browser/preview-preferences.ts | 2 +- packages/preview/src/browser/preview-uri.ts | 2 +- .../preview/src/browser/preview-widget.ts | 2 +- packages/preview/src/browser/style/index.css | 4 +- .../src/browser/style/preview-widget.css | 12 +- packages/preview/src/package.spec.ts | 2 +- packages/process/package.json | 2 +- .../src/common/process-common-module.ts | 2 +- .../src/common/process-manager-types.ts | 2 +- .../common/shell-command-builder.slow-spec.ts | 2 +- .../src/common/shell-command-builder.ts | 2 +- .../process/src/common/shell-quoting.spec.ts | 2 +- packages/process/src/common/shell-quoting.ts | 2 +- packages/process/src/node/dev-null-stream.ts | 2 +- packages/process/src/node/index.ts | 2 +- .../src/node/multi-ring-buffer.spec.ts | 2 +- .../process/src/node/multi-ring-buffer.ts | 2 +- .../src/node/process-backend-module.ts | 2 +- packages/process/src/node/process-manager.ts | 2 +- packages/process/src/node/process.ts | 2 +- packages/process/src/node/pseudo-pty.ts | 2 +- packages/process/src/node/raw-process.spec.ts | 2 +- packages/process/src/node/raw-process.ts | 2 +- packages/process/src/node/string-argv.d.ts | 2 +- .../process/src/node/task-terminal-process.ts | 2 +- .../process/src/node/terminal-process.spec.ts | 2 +- packages/process/src/node/terminal-process.ts | 2 +- .../src/node/test/process-fork-test.js | 2 +- .../src/node/test/process-test-container.ts | 2 +- packages/process/src/node/utils.ts | 2 +- packages/property-view/package.json | 2 +- .../empty-property-view-widget-provider.tsx | 2 +- .../src/browser/property-data-service.ts | 2 +- .../browser/property-view-content-widget.ts | 2 +- .../src/browser/property-view-contribution.ts | 2 +- .../browser/property-view-frontend-module.ts | 2 +- .../src/browser/property-view-service.ts | 2 +- .../browser/property-view-widget-provider.ts | 2 +- .../src/browser/property-view-widget.tsx | 2 +- .../browser/resource-property-view/index.ts | 2 +- .../resource-property-data-service.spec.ts | 2 +- .../resource-property-data-service.ts | 2 +- ...ource-property-view-label-provider.spec.ts | 4 +- .../resource-property-view-label-provider.ts | 2 +- .../resource-property-view-tree-container.ts | 2 +- .../resource-property-view-tree-items.ts | 2 +- .../resource-property-view-tree-widget.tsx | 2 +- .../resource-property-view-widget-provider.ts | 2 +- .../src/browser/style/property-view.css | 32 +- packages/property-view/src/package.spec.ts | 2 +- packages/scm-extra/package.json | 2 +- .../scm-extra/src/browser/history/index.ts | 2 +- .../browser/history/scm-history-constants.ts | 2 +- .../history/scm-history-contribution.ts | 2 +- .../history/scm-history-frontend-module.ts | 2 +- .../browser/history/scm-history-provider.ts | 2 +- .../browser/history/scm-history-widget.tsx | 2 +- .../src/browser/scm-extra-contribution.ts | 2 +- .../src/browser/scm-extra-frontend-module.ts | 2 +- .../browser/scm-extra-layout-migrations.ts | 2 +- .../browser/scm-file-change-label-provider.ts | 2 +- .../src/browser/scm-file-change-node.ts | 2 +- .../src/browser/scm-navigable-list-widget.tsx | 2 +- .../scm-extra/src/browser/style/history.css | 189 +++-- packages/scm/package.json | 2 +- .../decorations/scm-decorations-service.ts | 2 +- .../decorations/scm-navigator-decorator.ts | 2 +- .../decorations/scm-tab-bar-decorator.ts | 2 +- .../browser/dirty-diff/content-lines.spec.ts | 2 +- .../src/browser/dirty-diff/content-lines.ts | 2 +- .../browser/dirty-diff/diff-computer.spec.ts | 2 +- .../src/browser/dirty-diff/diff-computer.ts | 2 +- .../dirty-diff/dirty-diff-decorator.ts | 2 +- .../browser/dirty-diff/dirty-diff-module.ts | 2 +- .../scm/src/browser/scm-amend-component.tsx | 2 +- packages/scm/src/browser/scm-amend-widget.tsx | 2 +- .../scm/src/browser/scm-avatar-service.ts | 2 +- .../scm/src/browser/scm-commit-widget.tsx | 2 +- .../src/browser/scm-context-key-service.ts | 2 +- packages/scm/src/browser/scm-contribution.ts | 2 +- .../scm/src/browser/scm-frontend-module.ts | 2 +- .../scm/src/browser/scm-groups-tree-model.ts | 2 +- packages/scm/src/browser/scm-input.ts | 2 +- .../scm/src/browser/scm-layout-migrations.ts | 2 +- .../src/browser/scm-no-repository-widget.tsx | 2 +- packages/scm/src/browser/scm-preferences.ts | 2 +- packages/scm/src/browser/scm-provider.ts | 2 +- .../scm/src/browser/scm-quick-open-service.ts | 2 +- packages/scm/src/browser/scm-repository.ts | 2 +- packages/scm/src/browser/scm-service.ts | 2 +- .../src/browser/scm-tree-label-provider.ts | 2 +- packages/scm/src/browser/scm-tree-model.ts | 2 +- packages/scm/src/browser/scm-tree-widget.tsx | 2 +- packages/scm/src/browser/scm-widget.tsx | 2 +- packages/scm/src/browser/style/dirty-diff.css | 28 +- packages/scm/src/browser/style/index.css | 226 +++--- .../src/browser/style/scm-amend-component.css | 92 +-- packages/search-in-workspace/package.json | 2 +- .../components/search-in-workspace-input.tsx | 2 +- ...search-in-workspace-context-key-service.ts | 2 +- .../browser/search-in-workspace-factory.ts | 2 +- ...arch-in-workspace-frontend-contribution.ts | 2 +- .../search-in-workspace-frontend-module.ts | 2 +- .../search-in-workspace-label-provider.ts | 2 +- .../search-in-workspace-preferences.ts | 2 +- ...search-in-workspace-result-tree-widget.tsx | 2 +- .../browser/search-in-workspace-service.ts | 2 +- .../browser/search-in-workspace-widget.tsx | 2 +- .../src/browser/search-layout-migrations.ts | 2 +- .../src/browser/styles/index.css | 345 ++++----- .../common/search-in-workspace-interface.ts | 2 +- ...ep-search-in-workspace-server.slow-spec.ts | 2 +- .../ripgrep-search-in-workspace-server.ts | 2 +- .../search-in-workspace-backend-module.ts | 2 +- packages/secondary-window/package.json | 2 +- .../secondary-window-frontend-contribution.ts | 2 +- .../secondary-window-frontend-module.ts | 2 +- packages/secondary-window/src/package.spec.ts | 2 +- packages/task/package.json | 2 +- packages/task/src/browser/index.ts | 2 +- .../process/process-task-contribution.ts | 2 +- .../process/process-task-frontend-module.ts | 2 +- .../browser/process/process-task-resolver.ts | 2 +- .../provided-task-configurations.spec.ts | 2 +- .../browser/provided-task-configurations.ts | 26 +- packages/task/src/browser/quick-open-task.ts | 4 +- packages/task/src/browser/style/index.css | 6 +- .../src/browser/task-configuration-manager.ts | 2 +- .../src/browser/task-configuration-model.ts | 2 +- .../task/src/browser/task-configurations.ts | 2 +- .../task/src/browser/task-contribution.ts | 2 +- .../browser/task-definition-registry.spec.ts | 2 +- .../src/browser/task-definition-registry.ts | 2 +- .../src/browser/task-frontend-contribution.ts | 2 +- .../task/src/browser/task-frontend-module.ts | 2 +- .../task/src/browser/task-name-resolver.ts | 2 +- packages/task/src/browser/task-node.ts | 2 +- packages/task/src/browser/task-preferences.ts | 2 +- .../browser/task-problem-matcher-registry.ts | 2 +- .../browser/task-problem-pattern-registry.ts | 2 +- .../task/src/browser/task-schema-updater.ts | 2 +- packages/task/src/browser/task-service.ts | 6 +- .../task/src/browser/task-source-resolver.ts | 2 +- packages/task/src/browser/task-templates.ts | 2 +- .../browser/task-terminal-widget-manager.ts | 2 +- .../src/browser/tasks-monaco-contribution.ts | 2 +- packages/task/src/common/index.ts | 2 +- .../src/common/problem-matcher-protocol.ts | 2 +- .../task/src/common/process/task-protocol.ts | 2 +- .../task/src/common/task-common-module.ts | 2 +- packages/task/src/common/task-protocol.ts | 2 +- packages/task/src/common/task-watcher.ts | 2 +- .../custom-task-runner-backend-module.ts | 2 +- .../custom/custom-task-runner-contribution.ts | 2 +- .../src/node/custom/custom-task-runner.ts | 2 +- packages/task/src/node/custom/custom-task.ts | 2 +- packages/task/src/node/index.ts | 2 +- .../process-task-runner-backend-module.ts | 2 +- .../process-task-runner-contribution.ts | 2 +- .../src/node/process/process-task-runner.ts | 2 +- .../src/node/process/process-task.spec.ts | 2 +- .../task/src/node/process/process-task.ts | 2 +- .../src/node/task-abstract-line-matcher.ts | 2 +- .../task-backend-application-contribution.ts | 2 +- packages/task/src/node/task-backend-module.ts | 2 +- packages/task/src/node/task-line-matchers.ts | 2 +- packages/task/src/node/task-manager.ts | 2 +- .../src/node/task-problem-collector.spec.ts | 2 +- .../task/src/node/task-problem-collector.ts | 2 +- .../task/src/node/task-runner-protocol.ts | 2 +- packages/task/src/node/task-runner.ts | 2 +- .../task/src/node/task-server.slow-spec.ts | 2 +- packages/task/src/node/task-server.ts | 2 +- packages/task/src/node/task.ts | 2 +- .../task/src/node/test/task-test-container.ts | 2 +- packages/terminal/package.json | 2 +- .../src/browser/base/terminal-service.ts | 2 +- .../src/browser/base/terminal-widget.ts | 2 +- packages/terminal/src/browser/index.ts | 2 +- .../search/terminal-search-container.ts | 2 +- .../browser/search/terminal-search-widget.tsx | 2 +- .../src/browser/shell-terminal-profile.ts | 2 +- .../src/browser/style/terminal-search.css | 102 +-- .../terminal/src/browser/style/terminal.css | 11 +- .../src/browser/terminal-contribution.ts | 2 +- .../terminal-copy-on-selection-handler.ts | 2 +- .../browser/terminal-file-link-provider.ts | 2 +- .../browser/terminal-frontend-contribution.ts | 2 +- .../src/browser/terminal-frontend-module.ts | 2 +- .../browser/terminal-keybinding-contexts.ts | 2 +- .../src/browser/terminal-link-helpers.ts | 2 +- .../src/browser/terminal-link-provider.ts | 2 +- .../src/browser/terminal-preferences.ts | 2 +- .../src/browser/terminal-profile-service.ts | 2 +- .../browser/terminal-quick-open-service.ts | 2 +- .../src/browser/terminal-theme-service.ts | 2 +- .../src/browser/terminal-url-link-provider.ts | 2 +- .../src/browser/terminal-widget-impl.ts | 2 +- .../src/common/base-terminal-protocol.ts | 2 +- .../src/common/shell-terminal-protocol.ts | 2 +- .../src/common/terminal-common-module.ts | 2 +- .../terminal/src/common/terminal-protocol.ts | 2 +- .../terminal/src/common/terminal-watcher.ts | 2 +- .../terminal/src/node/base-terminal-server.ts | 2 +- .../src/node/buffering-stream.spec.ts | 2 +- .../terminal/src/node/buffering-stream.ts | 2 +- packages/terminal/src/node/index.ts | 2 +- packages/terminal/src/node/shell-process.ts | 2 +- .../src/node/shell-terminal-server.spec.ts | 2 +- .../src/node/shell-terminal-server.ts | 2 +- ...terminal-backend-contribution.slow-spec.ts | 2 +- .../src/node/terminal-backend-contribution.ts | 2 +- .../src/node/terminal-backend-module.ts | 2 +- .../terminal/src/node/terminal-server.spec.ts | 2 +- packages/terminal/src/node/terminal-server.ts | 2 +- .../src/node/test/terminal-test-container.ts | 2 +- packages/terminal/src/package.spec.ts | 2 +- packages/timeline/package.json | 2 +- packages/timeline/src/browser/style/index.css | 42 +- .../browser/timeline-context-key-service.ts | 2 +- .../src/browser/timeline-contribution.ts | 2 +- .../src/browser/timeline-empty-widget.tsx | 2 +- .../src/browser/timeline-frontend-module.ts | 2 +- .../timeline/src/browser/timeline-service.ts | 2 +- .../src/browser/timeline-tree-model.ts | 2 +- .../src/browser/timeline-tree-widget.tsx | 2 +- .../timeline/src/browser/timeline-widget.tsx | 2 +- .../timeline/src/common/timeline-model.ts | 2 +- packages/timeline/src/package.spec.ts | 2 +- packages/toolbar/fetch-icons.js | 2 +- packages/toolbar/package.json | 2 +- .../browser/abstract-toolbar-contribution.tsx | 2 +- ...application-shell-with-toolbar-override.ts | 2 +- packages/toolbar/src/browser/codicons.ts | 2 +- .../toolbar/src/browser/font-awesome-icons.ts | 2 +- packages/toolbar/src/browser/package.spec.ts | 2 +- .../toolbar/src/browser/style/toolbar.css | 212 +++--- .../browser/toolbar-command-contribution.ts | 2 +- .../toolbar-command-quick-input-service.ts | 2 +- .../toolbar/src/browser/toolbar-constants.ts | 2 +- .../toolbar/src/browser/toolbar-controller.ts | 2 +- .../toolbar/src/browser/toolbar-defaults.ts | 2 +- .../src/browser/toolbar-frontend-module.ts | 2 +- .../browser/toolbar-icon-selector-dialog.tsx | 2 +- .../toolbar/src/browser/toolbar-interfaces.ts | 2 +- .../toolbar-preference-contribution.ts | 2 +- .../src/browser/toolbar-preference-schema.ts | 2 +- .../src/browser/toolbar-storage-provider.ts | 2 +- packages/toolbar/src/browser/toolbar.tsx | 2 +- packages/typehierarchy/package.json | 2 +- packages/typehierarchy/src/browser/index.ts | 2 +- .../typehierarchy/src/browser/style/index.css | 10 +- .../tree/typehierarchy-tree-container.ts | 2 +- .../browser/tree/typehierarchy-tree-model.ts | 2 +- .../tree/typehierarchy-tree-widget.tsx | 2 +- .../src/browser/tree/typehierarchy-tree.ts | 2 +- .../src/browser/typehierarchy-contribution.ts | 2 +- .../browser/typehierarchy-frontend-module.ts | 2 +- .../src/browser/typehierarchy-provider.ts | 2 +- .../src/browser/typehierarchy-service.ts | 2 +- .../src/browser/typehierarchy.ts | 2 +- packages/typehierarchy/src/package.spec.ts | 2 +- packages/userstorage/package.json | 2 +- packages/userstorage/src/browser/index.ts | 2 +- .../src/browser/user-storage-contribution.ts | 2 +- .../browser/user-storage-frontend-module.ts | 2 +- .../src/browser/user-storage-uri.ts | 2 +- packages/userstorage/src/package.spec.ts | 2 +- packages/variable-resolver/package.json | 2 +- .../browser/common-variable-contribution.ts | 2 +- .../variable-resolver/src/browser/index.ts | 2 +- .../src/browser/variable-input-schema.ts | 2 +- .../src/browser/variable-input.ts | 2 +- .../browser/variable-quick-open-service.ts | 2 +- ...ble-resolver-frontend-contribution.spec.ts | 2 +- ...variable-resolver-frontend-contribution.ts | 2 +- .../variable-resolver-frontend-module.ts | 2 +- .../browser/variable-resolver-service.spec.ts | 2 +- .../src/browser/variable-resolver-service.ts | 2 +- .../src/browser/variable.spec.ts | 2 +- .../variable-resolver/src/browser/variable.ts | 2 +- .../src/common/variable-types.ts | 2 +- packages/vsx-registry/package.json | 2 +- .../preference-provider-overrides.ts | 2 +- .../recommended-extensions-json-schema.ts | 2 +- ...nded-extensions-preference-contribution.ts | 2 +- .../vsx-registry/src/browser/style/index.css | 326 ++++---- .../src/browser/vsx-extension-commands.ts | 2 +- .../browser/vsx-extension-editor-manager.ts | 2 +- .../src/browser/vsx-extension-editor.tsx | 2 +- .../src/browser/vsx-extension.tsx | 2 +- .../browser/vsx-extensions-contribution.ts | 2 +- .../src/browser/vsx-extensions-model.ts | 2 +- .../src/browser/vsx-extensions-search-bar.tsx | 2 +- .../browser/vsx-extensions-search-model.ts | 2 +- .../src/browser/vsx-extensions-source.ts | 2 +- .../browser/vsx-extensions-view-container.ts | 2 +- .../src/browser/vsx-extensions-widget.tsx | 2 +- .../vsx-language-quick-pick-service.ts | 2 +- .../browser/vsx-registry-frontend-module.ts | 2 +- .../src/common/ovsx-client-provider.ts | 2 +- .../src/common/vsx-environment.ts | 2 +- .../src/common/vsx-extension-uri.ts | 2 +- .../src/node/vsx-environment-impl.ts | 2 +- .../src/node/vsx-extension-resolver.ts | 2 +- .../src/node/vsx-registry-backend-module.ts | 2 +- packages/vsx-registry/src/package.spec.ts | 2 +- packages/workspace/package.json | 2 +- .../workspace/src/browser/diff-service.ts | 2 +- packages/workspace/src/browser/index.ts | 2 +- .../src/browser/quick-open-workspace.ts | 2 +- .../browser/untitled-workspace-exit-dialog.ts | 2 +- .../workspace-breadcrumbs-contribution.ts | 2 +- .../src/browser/workspace-commands.spec.ts | 2 +- .../src/browser/workspace-commands.ts | 2 +- .../src/browser/workspace-compare-handler.ts | 2 +- .../src/browser/workspace-delete-handler.ts | 2 +- .../browser/workspace-duplicate-handler.ts | 2 +- .../workspace-frontend-contribution.ts | 2 +- .../src/browser/workspace-frontend-module.ts | 2 +- .../src/browser/workspace-input-dialog.ts | 2 +- .../src/browser/workspace-preferences.ts | 2 +- .../src/browser/workspace-schema-updater.ts | 2 +- .../src/browser/workspace-service.ts | 2 +- .../src/browser/workspace-storage-service.ts | 2 +- .../browser/workspace-trust-preferences.ts | 2 +- .../src/browser/workspace-trust-service.ts | 2 +- .../workspace-uri-contribution.spec.ts | 2 +- .../src/browser/workspace-uri-contribution.ts | 2 +- ...rkspace-user-working-directory-provider.ts | 2 +- .../workspace/src/browser/workspace-utils.ts | 2 +- .../workspace-variable-contribution.ts | 2 +- .../browser/workspace-window-title-updater.ts | 2 +- packages/workspace/src/common/index.ts | 2 +- .../src/common/test/mock-workspace-server.ts | 2 +- packages/workspace/src/common/utils.ts | 2 +- .../src/common/workspace-protocol.ts | 2 +- .../src/node/default-workspace-server.spec.ts | 2 +- .../src/node/default-workspace-server.ts | 2 +- packages/workspace/src/node/index.ts | 2 +- .../src/node/workspace-backend-module.ts | 2 +- scripts/check-publish.js | 2 +- scripts/check_3pp_licenses.js | 8 +- scripts/compile-references.js | 2 +- scripts/lerna.js | 2 +- scripts/performance/base-package.json | 2 +- scripts/performance/browser-performance.js | 2 +- scripts/performance/common-performance.js | 2 +- scripts/performance/electron-performance.js | 2 +- scripts/performance/extension-impact.js | 2 +- scripts/prepare-initial.js | 6 +- scripts/replace-license-headers.js | 2 +- scripts/run-reverse-topo.js | 2 +- 1989 files changed, 5701 insertions(+), 5469 deletions(-) rename LICENSE-GPL => LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION (92%) diff --git a/.github/workflows/set-milestone-on-pr.yml b/.github/workflows/set-milestone-on-pr.yml index 8333e5a044f6a..226b68474c4f3 100644 --- a/.github/workflows/set-milestone-on-pr.yml +++ b/.github/workflows/set-milestone-on-pr.yml @@ -10,7 +10,7 @@ # 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 +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 # Set milestone on each pull request by using the next minor version # next version is computed using npm version tool diff --git a/.vscode/theia.code-snippets b/.vscode/theia.code-snippets index 1deb5a355ecc6..24c9c99945ae5 100644 --- a/.vscode/theia.code-snippets +++ b/.vscode/theia.code-snippets @@ -4,7 +4,7 @@ "header", "copyright" ], - "body": "// *****************************************************************************\n// Copyright (C) $CURRENT_YEAR ${YourCompany} and others.\n//\n// This program and the accompanying materials are made available under the\n// terms of the Eclipse Public License v. 2.0 which is available at\n// http://www.eclipse.org/legal/epl-2.0.\n//\n// This Source Code may also be made available under the following Secondary\n// Licenses when the conditions for such availability set forth in the Eclipse\n// Public License v. 2.0 are satisfied: GNU General Public License, version 2\n// with the GNU Classpath Exception which is available at\n// https://www.gnu.org/software/classpath/license.html.\n//\n// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0\n// *****************************************************************************\n$0", + "body": "// *****************************************************************************\n// Copyright (C) $CURRENT_YEAR ${YourCompany} and others.\n//\n// This program and the accompanying materials are made available under the\n// terms of the Eclipse Public License v. 2.0 which is available at\n// http://www.eclipse.org/legal/epl-2.0.\n//\n// This Source Code may also be made available under the following Secondary\n// Licenses when the conditions for such availability set forth in the Eclipse\n// Public License v. 2.0 are satisfied: GNU General Public License, version 2\n// with the GNU Classpath Exception which is available at\n// https://www.gnu.org/software/classpath/license.html.\n//\n// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0\n// *****************************************************************************\n$0", "description": "Adds the copyright...", "scope": "javascript,javascriptreact,typescript,typescriptreact" }, @@ -13,7 +13,7 @@ "header", "copyright" ], - "body": "/********************************************************************************\n * Copyright (C) $CURRENT_YEAR ${YourCompany} and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * http://www.eclipse.org/legal/epl-2.0.\n *\n * This Source Code may also be made available under the following Secondary\n * Licenses when the conditions for such availability set forth in the Eclipse\n * Public License v. 2.0 are satisfied: GNU General Public License, version 2\n * with the GNU Classpath Exception which is available at\n * https://www.gnu.org/software/classpath/license.html.\n *\n * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0\n ********************************************************************************/\n\n$0", + "body": "/********************************************************************************\n * Copyright (C) $CURRENT_YEAR ${YourCompany} and others.\n *\n * This program and the accompanying materials are made available under the\n * terms of the Eclipse Public License v. 2.0 which is available at\n * http://www.eclipse.org/legal/epl-2.0.\n *\n * This Source Code may also be made available under the following Secondary\n * Licenses when the conditions for such availability set forth in the Eclipse\n * Public License v. 2.0 are satisfied: GNU General Public License, version 2\n * with the GNU Classpath Exception which is available at\n * https://www.gnu.org/software/classpath/license.html.\n *\n * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0\n ********************************************************************************/\n\n$0", "description": "Adds the copyright...", "scope": "css" } diff --git a/LICENSE-GPL b/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION similarity index 92% rename from LICENSE-GPL rename to LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION index b45e3cd5429ce..b8aa1bee43b6f 100644 --- a/LICENSE-GPL +++ b/LICENSE-GPL-2.0-ONLY-CLASSPATH-EXCEPTION @@ -338,25 +338,19 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. +Class Path Exception + +Linking this library statically or dynamically with other modules is making +a combined work based on this library. Thus, the terms and conditions of +the GNU General Public License cover the whole combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent modules, +and to copy and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked independent module, +the terms and conditions of the license of that module. An independent +module is a module which is not derived from or based on this library. If +you modify this library, you may extend this exception to your version of +the library, but you are not obligated to do so. If you do not wish to do +so, delete this exception statement from your version. diff --git a/NOTICE.md b/NOTICE.md index 8032856b53e19..a68be8b716cb6 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -25,7 +25,7 @@ availability set forth in the Eclipse Public License v. 2.0 are satisfied: General Public License v2.0 w/Classpath exception', 'https://www.gnu.org/software/classpath/license.html. -SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-with-classpath-exception +SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ## Source Code diff --git a/README.md b/README.md index 3a2ec73733bd3..d925522f2df2b 100644 --- a/README.md +++ b/README.md @@ -19,16 +19,16 @@ Eclipse Theia is an extensible framework to develop full-fledged multi-language -- [**Website**](#website) -- [**Releases**](#releases) -- [**Scope**](#scope) -- [**Roadmap**](#roadmap) -- [**Getting Started**](#getting-started) -- [**Contributing**](#contributing) -- [**Feedback**](#feedback) -- [**Documentation**](#documentation) -- [**License**](#license) -- [**Trademark**](#trademark) +- [Website](#website) +- [Releases](#releases) +- [Scope](#scope) +- [Roadmap](#roadmap) +- [Getting Started](#getting-started) +- [Contributing](#contributing) +- [Feedback](#feedback) +- [Documentation](#documentation) +- [License](#license) +- [Trademark](#trademark)
@@ -112,7 +112,7 @@ Read below how to engage with Theia community: ## License - [Eclipse Public License 2.0](LICENSE-EPL) -- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](LICENSE-GPL) +- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](LICENSE-GPL-W-CLASSPATH-EXCEPTION) ## Trademark diff --git a/configs/errors.eslintrc.json b/configs/errors.eslintrc.json index 857620c9af088..13f2ea5250dda 100644 --- a/configs/errors.eslintrc.json +++ b/configs/errors.eslintrc.json @@ -105,7 +105,7 @@ true, { "allow-single-line-comments": true, - "match": "SPDX-License-Identifier: EPL-2\\.0 OR GPL-2\\.0 WITH Classpath-exception-2\\.0" + "match": "SPDX-License-Identifier: EPL-2\\.0 OR GPL-2\\.0-only WITH Classpath-exception-2\\.0" } ], "jsdoc-format": [ diff --git a/dev-packages/application-manager/package.json b/dev-packages/application-manager/package.json index 81411c5e092e6..23841be221e3a 100644 --- a/dev-packages/application-manager/package.json +++ b/dev-packages/application-manager/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/application-manager/src/application-package-manager.ts b/dev-packages/application-manager/src/application-package-manager.ts index 2777eb9b019f4..33a0346d0ec93 100644 --- a/dev-packages/application-manager/src/application-package-manager.ts +++ b/dev-packages/application-manager/src/application-package-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/dev-packages/application-manager/src/application-process.ts b/dev-packages/application-manager/src/application-process.ts index ec13d4dbfc120..47fda1c743ba1 100644 --- a/dev-packages/application-manager/src/application-process.ts +++ b/dev-packages/application-manager/src/application-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/dev-packages/application-manager/src/expose-loader.ts b/dev-packages/application-manager/src/expose-loader.ts index 5d96a19c6b64c..bdd707005acdb 100644 --- a/dev-packages/application-manager/src/expose-loader.ts +++ b/dev-packages/application-manager/src/expose-loader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs-extra'; diff --git a/dev-packages/application-manager/src/generator/abstract-generator.ts b/dev-packages/application-manager/src/generator/abstract-generator.ts index 804654551f2d1..c04b918e0cdd5 100644 --- a/dev-packages/application-manager/src/generator/abstract-generator.ts +++ b/dev-packages/application-manager/src/generator/abstract-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as os from 'os'; diff --git a/dev-packages/application-manager/src/generator/backend-generator.ts b/dev-packages/application-manager/src/generator/backend-generator.ts index f7de3c37b49f4..3d88c9daf4eeb 100644 --- a/dev-packages/application-manager/src/generator/backend-generator.ts +++ b/dev-packages/application-manager/src/generator/backend-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AbstractGenerator } from './abstract-generator'; diff --git a/dev-packages/application-manager/src/generator/frontend-generator.ts b/dev-packages/application-manager/src/generator/frontend-generator.ts index 31bfe42925618..25e5e04b60fab 100644 --- a/dev-packages/application-manager/src/generator/frontend-generator.ts +++ b/dev-packages/application-manager/src/generator/frontend-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/indent */ diff --git a/dev-packages/application-manager/src/generator/index.ts b/dev-packages/application-manager/src/generator/index.ts index 7c1045a74e204..9d3cac8ce4b0a 100644 --- a/dev-packages/application-manager/src/generator/index.ts +++ b/dev-packages/application-manager/src/generator/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './webpack-generator'; diff --git a/dev-packages/application-manager/src/generator/webpack-generator.ts b/dev-packages/application-manager/src/generator/webpack-generator.ts index a5e26d8377c6c..42089eee185b0 100644 --- a/dev-packages/application-manager/src/generator/webpack-generator.ts +++ b/dev-packages/application-manager/src/generator/webpack-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as paths from 'path'; diff --git a/dev-packages/application-manager/src/index.ts b/dev-packages/application-manager/src/index.ts index 6e29e7dd677e9..e46b503e82e8a 100644 --- a/dev-packages/application-manager/src/index.ts +++ b/dev-packages/application-manager/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './rebuild'; diff --git a/dev-packages/application-manager/src/package.spec.ts b/dev-packages/application-manager/src/package.spec.ts index b45680bc605bc..e77d4fb9a324e 100644 --- a/dev-packages/application-manager/src/package.spec.ts +++ b/dev-packages/application-manager/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/dev-packages/application-manager/src/rebuild.ts b/dev-packages/application-manager/src/rebuild.ts index 3eca2c23d16d1..2cf09dfc2e8bb 100644 --- a/dev-packages/application-manager/src/rebuild.ts +++ b/dev-packages/application-manager/src/rebuild.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import cp = require('child_process'); diff --git a/dev-packages/application-package/package.json b/dev-packages/application-package/package.json index 0e8969993be75..88e3c298fddda 100644 --- a/dev-packages/application-package/package.json +++ b/dev-packages/application-package/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/application-package/src/api.ts b/dev-packages/application-package/src/api.ts index 5bba99c7364ef..6e23cadfccedc 100644 --- a/dev-packages/application-package/src/api.ts +++ b/dev-packages/application-package/src/api.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/dev-packages/application-package/src/application-package.spec.ts b/dev-packages/application-package/src/application-package.spec.ts index 979c72aca9d44..4167f830654b1 100644 --- a/dev-packages/application-package/src/application-package.spec.ts +++ b/dev-packages/application-package/src/application-package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/dev-packages/application-package/src/application-package.ts b/dev-packages/application-package/src/application-package.ts index 28906e16685c6..68492002ecde3 100644 --- a/dev-packages/application-package/src/application-package.ts +++ b/dev-packages/application-package/src/application-package.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as paths from 'path'; diff --git a/dev-packages/application-package/src/application-props.ts b/dev-packages/application-package/src/application-props.ts index 7b0d0504145cd..64ee7ba448001 100644 --- a/dev-packages/application-package/src/application-props.ts +++ b/dev-packages/application-package/src/application-props.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import type { BrowserWindowConstructorOptions } from 'electron'; diff --git a/dev-packages/application-package/src/environment.ts b/dev-packages/application-package/src/environment.ts index 0ab93160236fa..e12ae3d24b5ef 100644 --- a/dev-packages/application-package/src/environment.ts +++ b/dev-packages/application-package/src/environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const isElectron: () => boolean = require('is-electron'); diff --git a/dev-packages/application-package/src/extension-package-collector.ts b/dev-packages/application-package/src/extension-package-collector.ts index f536c8177a6ec..c26c57e15ee6d 100644 --- a/dev-packages/application-package/src/extension-package-collector.ts +++ b/dev-packages/application-package/src/extension-package-collector.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { readJsonFile } from './json-file'; diff --git a/dev-packages/application-package/src/extension-package.ts b/dev-packages/application-package/src/extension-package.ts index c5ec609d4efc8..acf2335435cae 100644 --- a/dev-packages/application-package/src/extension-package.ts +++ b/dev-packages/application-package/src/extension-package.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs-extra'; diff --git a/dev-packages/application-package/src/index.ts b/dev-packages/application-package/src/index.ts index 657e0ce133c7c..ade5cc6c09eb0 100644 --- a/dev-packages/application-package/src/index.ts +++ b/dev-packages/application-package/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './npm-registry'; diff --git a/dev-packages/application-package/src/json-file.ts b/dev-packages/application-package/src/json-file.ts index 9a37ba5795a4d..e9080f5265929 100644 --- a/dev-packages/application-package/src/json-file.ts +++ b/dev-packages/application-package/src/json-file.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs'; diff --git a/dev-packages/application-package/src/npm-registry.ts b/dev-packages/application-package/src/npm-registry.ts index a32fb78b874db..70cfc45753d43 100644 --- a/dev-packages/application-package/src/npm-registry.ts +++ b/dev-packages/application-package/src/npm-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/dev-packages/cli/package.json b/dev-packages/cli/package.json index 5e1ac34771eea..3425c407313bf 100644 --- a/dev-packages/cli/package.json +++ b/dev-packages/cli/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/cli/src/check-dependencies.ts b/dev-packages/cli/src/check-dependencies.ts index 00d9e852b4fb9..426ba004de97e 100644 --- a/dev-packages/cli/src/check-dependencies.ts +++ b/dev-packages/cli/src/check-dependencies.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs'; diff --git a/dev-packages/cli/src/download-plugins.ts b/dev-packages/cli/src/download-plugins.ts index dc5da1c7744f6..e68c00f72d68e 100644 --- a/dev-packages/cli/src/download-plugins.ts +++ b/dev-packages/cli/src/download-plugins.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/dev-packages/cli/src/run-test.ts b/dev-packages/cli/src/run-test.ts index 69cd52ef6fc61..eab504cd5190e 100644 --- a/dev-packages/cli/src/run-test.ts +++ b/dev-packages/cli/src/run-test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/dev-packages/cli/src/test-page.ts b/dev-packages/cli/src/test-page.ts index f7fa58d9132f5..fe158c48f4882 100644 --- a/dev-packages/cli/src/test-page.ts +++ b/dev-packages/cli/src/test-page.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/dev-packages/cli/src/theia.ts b/dev-packages/cli/src/theia.ts index 7e925a8eb952f..dea322c4e3a23 100644 --- a/dev-packages/cli/src/theia.ts +++ b/dev-packages/cli/src/theia.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs'; diff --git a/dev-packages/ffmpeg/native/ffmpeg.c b/dev-packages/ffmpeg/native/ffmpeg.c index 690e0a27f2644..192cf1356cf05 100644 --- a/dev-packages/ffmpeg/native/ffmpeg.c +++ b/dev-packages/ffmpeg/native/ffmpeg.c @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/dev-packages/ffmpeg/native/linux-ffmpeg.c b/dev-packages/ffmpeg/native/linux-ffmpeg.c index ba72c98d8967a..dd8c81c698704 100644 --- a/dev-packages/ffmpeg/native/linux-ffmpeg.c +++ b/dev-packages/ffmpeg/native/linux-ffmpeg.c @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** #ifndef LINUX_FFMPEG diff --git a/dev-packages/ffmpeg/native/mac-ffmpeg.c b/dev-packages/ffmpeg/native/mac-ffmpeg.c index 269fd97c1c91f..4d3adb9d09e97 100644 --- a/dev-packages/ffmpeg/native/mac-ffmpeg.c +++ b/dev-packages/ffmpeg/native/mac-ffmpeg.c @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** #ifndef MAC_FFMPEG diff --git a/dev-packages/ffmpeg/native/win-ffmpeg.c b/dev-packages/ffmpeg/native/win-ffmpeg.c index 52b7d5246b789..2f819b50c2ea1 100644 --- a/dev-packages/ffmpeg/native/win-ffmpeg.c +++ b/dev-packages/ffmpeg/native/win-ffmpeg.c @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** #ifndef WIN_FFMPEG #define WIN_FFMPEG diff --git a/dev-packages/ffmpeg/package.json b/dev-packages/ffmpeg/package.json index 6c7725fcea4b0..7f10f0f456f4a 100644 --- a/dev-packages/ffmpeg/package.json +++ b/dev-packages/ffmpeg/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/ffmpeg/src/check-ffmpeg.ts b/dev-packages/ffmpeg/src/check-ffmpeg.ts index 4c576b004ee7a..c7d2a4aa8ae6d 100644 --- a/dev-packages/ffmpeg/src/check-ffmpeg.ts +++ b/dev-packages/ffmpeg/src/check-ffmpeg.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as ffmpeg from './ffmpeg'; diff --git a/dev-packages/ffmpeg/src/ffmpeg.ts b/dev-packages/ffmpeg/src/ffmpeg.ts index 801f18a8f6285..bcebc2cddfd66 100644 --- a/dev-packages/ffmpeg/src/ffmpeg.ts +++ b/dev-packages/ffmpeg/src/ffmpeg.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import path = require('path'); diff --git a/dev-packages/ffmpeg/src/hash.ts b/dev-packages/ffmpeg/src/hash.ts index 1b3911ff2e2fb..81627b5db36a3 100644 --- a/dev-packages/ffmpeg/src/hash.ts +++ b/dev-packages/ffmpeg/src/hash.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import crypto = require('crypto'); diff --git a/dev-packages/ffmpeg/src/index.ts b/dev-packages/ffmpeg/src/index.ts index 7b795bdc713bc..38738ee4a12ad 100644 --- a/dev-packages/ffmpeg/src/index.ts +++ b/dev-packages/ffmpeg/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './hash'; diff --git a/dev-packages/ffmpeg/src/replace-ffmpeg.ts b/dev-packages/ffmpeg/src/replace-ffmpeg.ts index f563186a95e50..e30bb974902e4 100644 --- a/dev-packages/ffmpeg/src/replace-ffmpeg.ts +++ b/dev-packages/ffmpeg/src/replace-ffmpeg.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import electronGet = require('@electron/get'); diff --git a/dev-packages/localization-manager/package.json b/dev-packages/localization-manager/package.json index e9c40fbb6a221..efc102965e511 100644 --- a/dev-packages/localization-manager/package.json +++ b/dev-packages/localization-manager/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/localization-manager/src/common.ts b/dev-packages/localization-manager/src/common.ts index ee600342623c4..046f2f34a64de 100644 --- a/dev-packages/localization-manager/src/common.ts +++ b/dev-packages/localization-manager/src/common.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface Localization { diff --git a/dev-packages/localization-manager/src/deepl-api.ts b/dev-packages/localization-manager/src/deepl-api.ts index f80a203d66b8a..95ee5df4635c3 100644 --- a/dev-packages/localization-manager/src/deepl-api.ts +++ b/dev-packages/localization-manager/src/deepl-api.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as bent from 'bent'; diff --git a/dev-packages/localization-manager/src/index.ts b/dev-packages/localization-manager/src/index.ts index 9203e34e7bd69..c88ddd2e31af1 100644 --- a/dev-packages/localization-manager/src/index.ts +++ b/dev-packages/localization-manager/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './common'; diff --git a/dev-packages/localization-manager/src/localization-extractor.spec.ts b/dev-packages/localization-manager/src/localization-extractor.spec.ts index 4a3c421edb20e..c3456c123dab2 100644 --- a/dev-packages/localization-manager/src/localization-extractor.spec.ts +++ b/dev-packages/localization-manager/src/localization-extractor.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/dev-packages/localization-manager/src/localization-extractor.ts b/dev-packages/localization-manager/src/localization-extractor.ts index 656dac8fae094..387a54d90c641 100644 --- a/dev-packages/localization-manager/src/localization-extractor.ts +++ b/dev-packages/localization-manager/src/localization-extractor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs-extra'; diff --git a/dev-packages/localization-manager/src/localization-manager.spec.ts b/dev-packages/localization-manager/src/localization-manager.spec.ts index afc9c6d07a537..da58cb7a30636 100644 --- a/dev-packages/localization-manager/src/localization-manager.spec.ts +++ b/dev-packages/localization-manager/src/localization-manager.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/dev-packages/localization-manager/src/localization-manager.ts b/dev-packages/localization-manager/src/localization-manager.ts index fabedebf973fa..90d650e59f225 100644 --- a/dev-packages/localization-manager/src/localization-manager.ts +++ b/dev-packages/localization-manager/src/localization-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chalk from 'chalk'; diff --git a/dev-packages/ovsx-client/package.json b/dev-packages/ovsx-client/package.json index 8ec87feefdffb..1c788df7f7ce2 100644 --- a/dev-packages/ovsx-client/package.json +++ b/dev-packages/ovsx-client/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/ovsx-client/src/index.ts b/dev-packages/ovsx-client/src/index.ts index 3f17e784262dd..391a16119e28d 100644 --- a/dev-packages/ovsx-client/src/index.ts +++ b/dev-packages/ovsx-client/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './ovsx-client'; diff --git a/dev-packages/ovsx-client/src/ovsx-client.spec.ts b/dev-packages/ovsx-client/src/ovsx-client.spec.ts index 8e49f6efba1f6..a41a3321fa69d 100644 --- a/dev-packages/ovsx-client/src/ovsx-client.spec.ts +++ b/dev-packages/ovsx-client/src/ovsx-client.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/dev-packages/ovsx-client/src/ovsx-client.ts b/dev-packages/ovsx-client/src/ovsx-client.ts index 61598267b21f4..564e630279351 100644 --- a/dev-packages/ovsx-client/src/ovsx-client.ts +++ b/dev-packages/ovsx-client/src/ovsx-client.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as semver from 'semver'; diff --git a/dev-packages/ovsx-client/src/ovsx-types.ts b/dev-packages/ovsx-client/src/ovsx-types.ts index b260fc7ec4271..cf14e519a953f 100644 --- a/dev-packages/ovsx-client/src/ovsx-types.ts +++ b/dev-packages/ovsx-client/src/ovsx-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/dev-packages/private-eslint-plugin/index.js b/dev-packages/private-eslint-plugin/index.js index 9b1fecc847178..aa082e196ca5b 100644 --- a/dev-packages/private-eslint-plugin/index.js +++ b/dev-packages/private-eslint-plugin/index.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** @type {{[ruleId: string]: import('eslint').Rule.RuleModule}} */ diff --git a/dev-packages/private-eslint-plugin/rules/localization-check.js b/dev-packages/private-eslint-plugin/rules/localization-check.js index 13e504e940e87..22bb561678536 100644 --- a/dev-packages/private-eslint-plugin/rules/localization-check.js +++ b/dev-packages/private-eslint-plugin/rules/localization-check.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const levenshtein = require('js-levenshtein'); diff --git a/dev-packages/private-eslint-plugin/rules/no-src-import.js b/dev-packages/private-eslint-plugin/rules/no-src-import.js index 49f1d7fda9952..84dcef592cf32 100644 --- a/dev-packages/private-eslint-plugin/rules/no-src-import.js +++ b/dev-packages/private-eslint-plugin/rules/no-src-import.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const path = require('path'); diff --git a/dev-packages/private-eslint-plugin/rules/runtime-import-check.js b/dev-packages/private-eslint-plugin/rules/runtime-import-check.js index 85b547251dad4..503333e7e3825 100644 --- a/dev-packages/private-eslint-plugin/rules/runtime-import-check.js +++ b/dev-packages/private-eslint-plugin/rules/runtime-import-check.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable max-len */ diff --git a/dev-packages/private-eslint-plugin/rules/shared-dependencies.js b/dev-packages/private-eslint-plugin/rules/shared-dependencies.js index 8a50890a47e59..19560ce6357ee 100644 --- a/dev-packages/private-eslint-plugin/rules/shared-dependencies.js +++ b/dev-packages/private-eslint-plugin/rules/shared-dependencies.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable max-len */ diff --git a/dev-packages/private-ext-scripts/package.json b/dev-packages/private-ext-scripts/package.json index 9d2bfb24bd6c0..7dd6152b6ab0e 100644 --- a/dev-packages/private-ext-scripts/package.json +++ b/dev-packages/private-ext-scripts/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@theia/ext-scripts", "version": "1.38.0", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "description": "NPM scripts for Theia packages.", "bin": { "run": "theia-run.js", diff --git a/dev-packages/private-ext-scripts/theia-ext.js b/dev-packages/private-ext-scripts/theia-ext.js index 999fe4efa3aae..e0f15b6aa394e 100755 --- a/dev-packages/private-ext-scripts/theia-ext.js +++ b/dev-packages/private-ext-scripts/theia-ext.js @@ -13,7 +13,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check const path = require('path'); diff --git a/dev-packages/private-ext-scripts/theia-run.js b/dev-packages/private-ext-scripts/theia-run.js index 5894f089fb1b7..68d75f1e36959 100755 --- a/dev-packages/private-ext-scripts/theia-run.js +++ b/dev-packages/private-ext-scripts/theia-run.js @@ -13,7 +13,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check const path = require('path'); diff --git a/dev-packages/private-ext-scripts/theia-ts-clean.js b/dev-packages/private-ext-scripts/theia-ts-clean.js index aed6c7c9ca7b4..62c3ba9e751c6 100755 --- a/dev-packages/private-ext-scripts/theia-ts-clean.js +++ b/dev-packages/private-ext-scripts/theia-ts-clean.js @@ -13,7 +13,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/dev-packages/private-re-exports/src/bin-package-re-exports-from-package.ts b/dev-packages/private-re-exports/src/bin-package-re-exports-from-package.ts index 28e73da180bba..efd9b6fa49849 100644 --- a/dev-packages/private-re-exports/src/bin-package-re-exports-from-package.ts +++ b/dev-packages/private-re-exports/src/bin-package-re-exports-from-package.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { readPackageJson, parsePackageReExports } from './package-re-exports'; diff --git a/dev-packages/private-re-exports/src/bin-theia-re-exports.ts b/dev-packages/private-re-exports/src/bin-theia-re-exports.ts index 13fd5805aa0e3..b2e243a4dc598 100644 --- a/dev-packages/private-re-exports/src/bin-theia-re-exports.ts +++ b/dev-packages/private-re-exports/src/bin-theia-re-exports.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import fs = require('fs'); diff --git a/dev-packages/private-re-exports/src/index.ts b/dev-packages/private-re-exports/src/index.ts index 1b890cc6494e6..454450db7374a 100644 --- a/dev-packages/private-re-exports/src/index.ts +++ b/dev-packages/private-re-exports/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './utility'; diff --git a/dev-packages/private-re-exports/src/package-re-exports.ts b/dev-packages/private-re-exports/src/package-re-exports.ts index 2c1e0fdb67ed1..40aebc7a91db4 100644 --- a/dev-packages/private-re-exports/src/package-re-exports.ts +++ b/dev-packages/private-re-exports/src/package-re-exports.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import cp = require('child_process'); diff --git a/dev-packages/private-re-exports/src/utility.spec.ts b/dev-packages/private-re-exports/src/utility.spec.ts index 67f615b9307c8..cc292bdd1ccc5 100644 --- a/dev-packages/private-re-exports/src/utility.spec.ts +++ b/dev-packages/private-re-exports/src/utility.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { parseModule } from './utility'; diff --git a/dev-packages/private-re-exports/src/utility.ts b/dev-packages/private-re-exports/src/utility.ts index c7f57b9cfd802..799d5ac283cc4 100644 --- a/dev-packages/private-re-exports/src/utility.ts +++ b/dev-packages/private-re-exports/src/utility.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface PackageJson { diff --git a/dev-packages/request/package.json b/dev-packages/request/package.json index 39de4b11ee199..21c258ae2b993 100644 --- a/dev-packages/request/package.json +++ b/dev-packages/request/package.json @@ -5,7 +5,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/dev-packages/request/src/common-request-service.ts b/dev-packages/request/src/common-request-service.ts index 3506fecb3702e..44cb6dbcda9fd 100644 --- a/dev-packages/request/src/common-request-service.ts +++ b/dev-packages/request/src/common-request-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ const textDecoder = typeof TextDecoder !== 'undefined' ? new TextDecoder() : undefined; diff --git a/dev-packages/request/src/index.ts b/dev-packages/request/src/index.ts index d0518a4332d0f..28336ad45ec95 100644 --- a/dev-packages/request/src/index.ts +++ b/dev-packages/request/src/index.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ export * from './common-request-service'; diff --git a/dev-packages/request/src/node-request-service.ts b/dev-packages/request/src/node-request-service.ts index 21b64c7fa3334..4126647f6451a 100644 --- a/dev-packages/request/src/node-request-service.ts +++ b/dev-packages/request/src/node-request-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import * as http from 'http'; diff --git a/dev-packages/request/src/package.spec.ts b/dev-packages/request/src/package.spec.ts index 8bdd97ff579bf..f69ef6d9af4db 100644 --- a/dev-packages/request/src/package.spec.ts +++ b/dev-packages/request/src/package.spec.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* note: this bogus test file is required so that diff --git a/dev-packages/request/src/proxy.ts b/dev-packages/request/src/proxy.ts index 5c4c496f16fc9..92b641d47f79e 100644 --- a/dev-packages/request/src/proxy.ts +++ b/dev-packages/request/src/proxy.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { parse as parseUrl, Url } from 'url'; diff --git a/examples/api-samples/package.json b/examples/api-samples/package.json index f8794371fcaaa..b28e1792c41e1 100644 --- a/examples/api-samples/package.json +++ b/examples/api-samples/package.json @@ -32,7 +32,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/examples/api-samples/src/browser/api-samples-frontend-module.ts b/examples/api-samples/src/browser/api-samples-frontend-module.ts index 7a30bcc868e07..2d168ce4f1146 100644 --- a/examples/api-samples/src/browser/api-samples-frontend-module.ts +++ b/examples/api-samples/src/browser/api-samples-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/contribution-filter/sample-filtered-command-contribution.ts b/examples/api-samples/src/browser/contribution-filter/sample-filtered-command-contribution.ts index 2aec516b563b7..e0c83ffed64de 100644 --- a/examples/api-samples/src/browser/contribution-filter/sample-filtered-command-contribution.ts +++ b/examples/api-samples/src/browser/contribution-filter/sample-filtered-command-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, CommandContribution, CommandRegistry, FilterContribution, ContributionFilterRegistry, bindContribution, Filter } from '@theia/core/lib/common'; diff --git a/examples/api-samples/src/browser/file-watching/sample-file-watching-contribution.ts b/examples/api-samples/src/browser/file-watching/sample-file-watching-contribution.ts index 7020a4967d0fe..8f639e2c20a9e 100644 --- a/examples/api-samples/src/browser/file-watching/sample-file-watching-contribution.ts +++ b/examples/api-samples/src/browser/file-watching/sample-file-watching-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { postConstruct, injectable, inject, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/label/sample-dynamic-label-provider-command-contribution.ts b/examples/api-samples/src/browser/label/sample-dynamic-label-provider-command-contribution.ts index d61d2026b5ef8..c3a28ce2cdf56 100644 --- a/examples/api-samples/src/browser/label/sample-dynamic-label-provider-command-contribution.ts +++ b/examples/api-samples/src/browser/label/sample-dynamic-label-provider-command-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/label/sample-dynamic-label-provider-contribution.ts b/examples/api-samples/src/browser/label/sample-dynamic-label-provider-contribution.ts index a45dcf8c9bd68..9fa4aff04507f 100644 --- a/examples/api-samples/src/browser/label/sample-dynamic-label-provider-contribution.ts +++ b/examples/api-samples/src/browser/label/sample-dynamic-label-provider-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/menu/sample-browser-menu-module.ts b/examples/api-samples/src/browser/menu/sample-browser-menu-module.ts index 35122f83dfe24..ef3c61d0d5d02 100644 --- a/examples/api-samples/src/browser/menu/sample-browser-menu-module.ts +++ b/examples/api-samples/src/browser/menu/sample-browser-menu-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, ContainerModule } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/menu/sample-menu-contribution.ts b/examples/api-samples/src/browser/menu/sample-menu-contribution.ts index 98275d3330f72..a8a2590623497 100644 --- a/examples/api-samples/src/browser/menu/sample-menu-contribution.ts +++ b/examples/api-samples/src/browser/menu/sample-menu-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ConfirmDialog, QuickInputService } from '@theia/core/lib/browser'; diff --git a/examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts b/examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts index 1dc99e7a27d44..e9a8b1369e13c 100644 --- a/examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts +++ b/examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /** @@ -48,7 +48,7 @@ function generateContent(properties: string, interfaceEntries: string[]): string * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { isOSX, isWindows, nls } from '@theia/core'; diff --git a/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts b/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts index 45fbf3ce34fb7..3d6e20ce3e766 100644 --- a/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts +++ b/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationContribution } from '@theia/core/lib/browser'; import { inject, injectable, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/style/branding.css b/examples/api-samples/src/browser/style/branding.css index a969d1e2b9d42..5c5e29bcce701 100644 --- a/examples/api-samples/src/browser/style/branding.css +++ b/examples/api-samples/src/browser/style/branding.css @@ -11,24 +11,24 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-icon { - background-image: url('../icons/theia.png'); - background-position: center; - background-repeat: no-repeat; - background-size: contain; + background-image: url("../icons/theia.png"); + background-position: center; + background-repeat: no-repeat; + background-size: contain; } - #theia-main-content-panel { - background-image: url('../icons/theia.png'); - background-position: center center; - background-repeat: no-repeat; - background-size: 15%; +#theia-main-content-panel { + background-image: url("../icons/theia.png"); + background-position: center center; + background-repeat: no-repeat; + background-size: 15%; } .unclosable-window-icon { - -webkit-mask: url('window-icon.svg'); - mask: url('window-icon.svg'); + -webkit-mask: url("window-icon.svg"); + mask: url("window-icon.svg"); } diff --git a/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.css b/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.css index a492c4b2c9c4c..e6601655b743c 100644 --- a/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.css +++ b/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.css @@ -11,35 +11,36 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #theia-sample-toolbar-contribution { - position: relative; + position: relative; } #theia-sample-toolbar-contribution .icon-wrapper { - cursor: pointer; - margin-left: 0; + cursor: pointer; + margin-left: 0; } #theia-sample-toolbar-contribution:focus, #theia-sample-toolbar-contribution .icon-wrapper:focus, #theia-sample-toolbar-contribution .codicon-search:focus { - outline: none; + outline: none; } -#theia-sample-toolbar-contribution .icon-wrapper.action-label.item.enabled:hover { - background-color: var(--theia-toolbar-hoverBackground); +#theia-sample-toolbar-contribution + .icon-wrapper.action-label.item.enabled:hover { + background-color: var(--theia-toolbar-hoverBackground); } #theia-sample-toolbar-contribution #easy-search-item-icon.codicon-search { - position: relative; + position: relative; } #theia-sample-toolbar-contribution .icon-wrapper .codicon-triangle-down { - position: absolute; - font-size: 10px; - bottom: -7px; - right: -2px; + position: absolute; + font-size: 10px; + bottom: -7px; + right: -2px; } diff --git a/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.tsx b/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.tsx index cfc932bb66c5c..cd510d638a63f 100644 --- a/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.tsx +++ b/examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandContribution, CommandRegistry, CommandService, MenuContribution, MenuModelRegistry } from '@theia/core'; diff --git a/examples/api-samples/src/browser/toolbar/sample-toolbar-defaults-override.ts b/examples/api-samples/src/browser/toolbar/sample-toolbar-defaults-override.ts index 5fabf07ef341f..fc7237a23418e 100644 --- a/examples/api-samples/src/browser/toolbar/sample-toolbar-defaults-override.ts +++ b/examples/api-samples/src/browser/toolbar/sample-toolbar-defaults-override.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DeflatedToolbarTree, ToolbarAlignment } from '@theia/toolbar/lib/browser/toolbar-interfaces'; diff --git a/examples/api-samples/src/browser/view/sample-unclosable-view-contribution.ts b/examples/api-samples/src/browser/view/sample-unclosable-view-contribution.ts index 6eef32f80f077..8d8e2d48067e6 100644 --- a/examples/api-samples/src/browser/view/sample-unclosable-view-contribution.ts +++ b/examples/api-samples/src/browser/view/sample-unclosable-view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/browser/view/sample-unclosable-view.tsx b/examples/api-samples/src/browser/view/sample-unclosable-view.tsx index 91c2bbaa34f23..f89990a00ffff 100644 --- a/examples/api-samples/src/browser/view/sample-unclosable-view.tsx +++ b/examples/api-samples/src/browser/view/sample-unclosable-view.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ReactWidget } from '@theia/core/lib/browser'; diff --git a/examples/api-samples/src/browser/vsx/sample-vsx-command-contribution.ts b/examples/api-samples/src/browser/vsx/sample-vsx-command-contribution.ts index c3e4df4134add..48796044f4668 100644 --- a/examples/api-samples/src/browser/vsx/sample-vsx-command-contribution.ts +++ b/examples/api-samples/src/browser/vsx/sample-vsx-command-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, interfaces } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/common/updater/sample-updater.ts b/examples/api-samples/src/common/updater/sample-updater.ts index 4860a3ea481da..92ef9c807b0b1 100644 --- a/examples/api-samples/src/common/updater/sample-updater.ts +++ b/examples/api-samples/src/common/updater/sample-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory'; diff --git a/examples/api-samples/src/electron-browser/menu/sample-electron-menu-module.ts b/examples/api-samples/src/electron-browser/menu/sample-electron-menu-module.ts index 2cd55bd0defed..d9f7e657660a7 100644 --- a/examples/api-samples/src/electron-browser/menu/sample-electron-menu-module.ts +++ b/examples/api-samples/src/electron-browser/menu/sample-electron-menu-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, ContainerModule } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-contribution.ts b/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-contribution.ts index 5a917a3b52f1f..0583b69f32f6f 100644 --- a/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-contribution.ts +++ b/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-module.ts b/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-module.ts index bc7ab932e3114..bb4c38e0d1903 100644 --- a/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-module.ts +++ b/examples/api-samples/src/electron-browser/updater/sample-updater-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/electron-main/update/sample-updater-impl.ts b/examples/api-samples/src/electron-main/update/sample-updater-impl.ts index 59467a5cb9a12..c27acbda913a2 100644 --- a/examples/api-samples/src/electron-main/update/sample-updater-impl.ts +++ b/examples/api-samples/src/electron-main/update/sample-updater-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/electron-main/update/sample-updater-main-module.ts b/examples/api-samples/src/electron-main/update/sample-updater-main-module.ts index 8e099425be8fc..1673f6ad855b4 100644 --- a/examples/api-samples/src/electron-main/update/sample-updater-main-module.ts +++ b/examples/api-samples/src/electron-main/update/sample-updater-main-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/node/api-samples-backend-module.ts b/examples/api-samples/src/node/api-samples-backend-module.ts index b34439714e6c8..e3c5ca963926b 100644 --- a/examples/api-samples/src/node/api-samples-backend-module.ts +++ b/examples/api-samples/src/node/api-samples-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/examples/api-samples/src/node/sample-backend-application-server.ts b/examples/api-samples/src/node/sample-backend-application-server.ts index ae71822e66b17..e5f26e5dbd38b 100644 --- a/examples/api-samples/src/node/sample-backend-application-server.ts +++ b/examples/api-samples/src/node/sample-backend-application-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/examples/api-tests/package.json b/examples/api-tests/package.json index 1331c1b3ee546..b0b6467891f42 100644 --- a/examples/api-tests/package.json +++ b/examples/api-tests/package.json @@ -5,7 +5,7 @@ "dependencies": { "@theia/core": "1.38.0" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/examples/api-tests/src/api-tests.d.ts b/examples/api-tests/src/api-tests.d.ts index e073c28d508ea..b0dd1ee699ab8 100644 --- a/examples/api-tests/src/api-tests.d.ts +++ b/examples/api-tests/src/api-tests.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** interface Window { diff --git a/examples/api-tests/src/browser-utils.spec.js b/examples/api-tests/src/browser-utils.spec.js index 0c72b44d93505..452a85eabb962 100644 --- a/examples/api-tests/src/browser-utils.spec.js +++ b/examples/api-tests/src/browser-utils.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/contribution-filter.spec.js b/examples/api-tests/src/contribution-filter.spec.js index c88f9dab1018c..389ce33a96b26 100644 --- a/examples/api-tests/src/contribution-filter.spec.js +++ b/examples/api-tests/src/contribution-filter.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/explorer-open-close.spec.js b/examples/api-tests/src/explorer-open-close.spec.js index eb9ee64b8bf01..d7c9d1f77bf6c 100644 --- a/examples/api-tests/src/explorer-open-close.spec.js +++ b/examples/api-tests/src/explorer-open-close.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/file-search.spec.js b/examples/api-tests/src/file-search.spec.js index cef044eb44a1b..5c1c259929b31 100644 --- a/examples/api-tests/src/file-search.spec.js +++ b/examples/api-tests/src/file-search.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/find-replace.spec.js b/examples/api-tests/src/find-replace.spec.js index d633f7cecfac9..943f68cc7efbb 100644 --- a/examples/api-tests/src/find-replace.spec.js +++ b/examples/api-tests/src/find-replace.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/keybindings.spec.js b/examples/api-tests/src/keybindings.spec.js index 55b6f04fe5b04..d7f992a456e0e 100644 --- a/examples/api-tests/src/keybindings.spec.js +++ b/examples/api-tests/src/keybindings.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/launch-preferences.spec.js b/examples/api-tests/src/launch-preferences.spec.js index 35c4671d8f9a2..ee201c03806a2 100644 --- a/examples/api-tests/src/launch-preferences.spec.js +++ b/examples/api-tests/src/launch-preferences.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/menus.spec.js b/examples/api-tests/src/menus.spec.js index d1715935dbf0e..542c533bc6ff9 100644 --- a/examples/api-tests/src/menus.spec.js +++ b/examples/api-tests/src/menus.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/monaco-api.spec.js b/examples/api-tests/src/monaco-api.spec.js index 8c8542b443da5..e5dc9cd238836 100644 --- a/examples/api-tests/src/monaco-api.spec.js +++ b/examples/api-tests/src/monaco-api.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check @@ -33,7 +33,7 @@ describe('Monaco API', async function () { const { MonacoContextKeyService } = require('@theia/monaco/lib/browser/monaco-context-key-service'); const { URI } = require('@theia/monaco-editor-core/esm/vs/base/common/uri'); const { animationFrame } = require('@theia/core/lib/browser/browser'); - + const container = window.theia.container; const editorManager = container.get(EditorManager); const workspaceService = container.get(WorkspaceService); diff --git a/examples/api-tests/src/navigator.spec.js b/examples/api-tests/src/navigator.spec.js index 3f178976257ba..b7a7ccef20259 100644 --- a/examples/api-tests/src/navigator.spec.js +++ b/examples/api-tests/src/navigator.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/preferences.spec.js b/examples/api-tests/src/preferences.spec.js index ab87643e96de1..20107188104ac 100644 --- a/examples/api-tests/src/preferences.spec.js +++ b/examples/api-tests/src/preferences.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/saveable.spec.js b/examples/api-tests/src/saveable.spec.js index 306b1c8b76a26..5fd4bff8bcbb3 100644 --- a/examples/api-tests/src/saveable.spec.js +++ b/examples/api-tests/src/saveable.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/scm.spec.js b/examples/api-tests/src/scm.spec.js index 6ba66e37b6e6b..ef759e7187ab8 100644 --- a/examples/api-tests/src/scm.spec.js +++ b/examples/api-tests/src/scm.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/shell.spec.js b/examples/api-tests/src/shell.spec.js index 67184c48ccad7..3d0777900b604 100644 --- a/examples/api-tests/src/shell.spec.js +++ b/examples/api-tests/src/shell.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/task-configurations.spec.js b/examples/api-tests/src/task-configurations.spec.js index b1296610ec329..d8b49f5dd0e46 100644 --- a/examples/api-tests/src/task-configurations.spec.js +++ b/examples/api-tests/src/task-configurations.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/typescript.spec.js b/examples/api-tests/src/typescript.spec.js index 0591d81d748fc..c4fe77e9a098f 100644 --- a/examples/api-tests/src/typescript.spec.js +++ b/examples/api-tests/src/typescript.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check @@ -445,9 +445,9 @@ describe('TypeScript', function () { assert.isTrue(contextKeyService.match('suggestWidgetVisible')); keybindings.dispatchKeyDown('Escape'); - + // once in a while, a second "Escape" is needed to dismiss widget - await waitForAnimation(() => { + await waitForAnimation(() => { const suggestWidgetDismissed = !contextKeyService.match('suggestWidgetVisible') && getFocusedLabel() === undefined; if (!suggestWidgetDismissed) { console.log('Re-try to dismiss suggest using "Escape" key'); @@ -706,7 +706,7 @@ SPAN { await commands.executeCommand('editor.action.quickFix'); const codeActionSelector = '.codeActionWidget'; assert.isFalse(!!document.querySelector(codeActionSelector), 'Failed at assert 3 - codeActionWidget should not be visible'); - + console.log('Waiting for Quick Fix widget to be visible'); await waitForAnimation(() => { const quickFixWidgetVisible = !!document.querySelector(codeActionSelector); diff --git a/examples/api-tests/src/undo-redo-selectAll.spec.js b/examples/api-tests/src/undo-redo-selectAll.spec.js index 59c33a6513f53..f7cd6aa0b550a 100644 --- a/examples/api-tests/src/undo-redo-selectAll.spec.js +++ b/examples/api-tests/src/undo-redo-selectAll.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/api-tests/src/views.spec.js b/examples/api-tests/src/views.spec.js index e3fc3a2cf7a4d..cdec58bc2348f 100644 --- a/examples/api-tests/src/views.spec.js +++ b/examples/api-tests/src/views.spec.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/examples/browser/package.json b/examples/browser/package.json index ee948adc12e3d..d0d1cbf5b0f73 100644 --- a/examples/browser/package.json +++ b/examples/browser/package.json @@ -2,7 +2,7 @@ "private": true, "name": "@theia/example-browser", "version": "1.38.0", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "theia": { "frontend": { "config": { diff --git a/examples/electron/package.json b/examples/electron/package.json index c25f70b2e9b97..c9f82582bc193 100644 --- a/examples/electron/package.json +++ b/examples/electron/package.json @@ -4,7 +4,7 @@ "productName": "Theia Electron Example", "version": "1.38.0", "main": "src-gen/frontend/electron-main.js", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "theia": { "target": "electron", "frontend": { diff --git a/examples/electron/test/basic-example.espec.ts b/examples/electron/test/basic-example.espec.ts index e3454727e87a5..3e8488636dcd1 100644 --- a/examples/electron/test/basic-example.espec.ts +++ b/examples/electron/test/basic-example.espec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/examples/playwright/package.json b/examples/playwright/package.json index 82d3a8d13745e..8a732ad260f5a 100644 --- a/examples/playwright/package.json +++ b/examples/playwright/package.json @@ -2,7 +2,7 @@ "name": "@theia/playwright", "version": "1.38.0", "description": "System tests for Theia", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/examples/playwright/playwright.config.ts b/examples/playwright/playwright.config.ts index 4f4a48a3ba7da..f07dd808d837f 100644 --- a/examples/playwright/playwright.config.ts +++ b/examples/playwright/playwright.config.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { defineConfig } from '@playwright/test'; diff --git a/examples/playwright/src/index.ts b/examples/playwright/src/index.ts index 6b4192f493c53..ca00881b5322f 100644 --- a/examples/playwright/src/index.ts +++ b/examples/playwright/src/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './theia-about-dialog'; diff --git a/examples/playwright/src/tests/fixtures/theia-fixture.ts b/examples/playwright/src/tests/fixtures/theia-fixture.ts index 28e9d3b543cd1..3c1d27efde1c7 100644 --- a/examples/playwright/src/tests/fixtures/theia-fixture.ts +++ b/examples/playwright/src/tests/fixtures/theia-fixture.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import test, { Page } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-app.test.ts b/examples/playwright/src/tests/theia-app.test.ts index b6f10698e9083..157e279899d83 100644 --- a/examples/playwright/src/tests/theia-app.test.ts +++ b/examples/playwright/src/tests/theia-app.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaApp } from '../theia-app'; diff --git a/examples/playwright/src/tests/theia-explorer-view.test.ts b/examples/playwright/src/tests/theia-explorer-view.test.ts index b746a5ae3ed0d..7977acfb2ad8a 100644 --- a/examples/playwright/src/tests/theia-explorer-view.test.ts +++ b/examples/playwright/src/tests/theia-explorer-view.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-main-menu.test.ts b/examples/playwright/src/tests/theia-main-menu.test.ts index 9a4d1e524245f..aad8595efcd83 100644 --- a/examples/playwright/src/tests/theia-main-menu.test.ts +++ b/examples/playwright/src/tests/theia-main-menu.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-output-view.test.ts b/examples/playwright/src/tests/theia-output-view.test.ts index d74c09e5badc9..c991081d751b0 100644 --- a/examples/playwright/src/tests/theia-output-view.test.ts +++ b/examples/playwright/src/tests/theia-output-view.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-preference-view.test.ts b/examples/playwright/src/tests/theia-preference-view.test.ts index 9d6059c88e2f7..f6e3491c4bab0 100644 --- a/examples/playwright/src/tests/theia-preference-view.test.ts +++ b/examples/playwright/src/tests/theia-preference-view.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-problems-view.test.ts b/examples/playwright/src/tests/theia-problems-view.test.ts index 16f2b5758c6fe..7fc79cc2b118a 100644 --- a/examples/playwright/src/tests/theia-problems-view.test.ts +++ b/examples/playwright/src/tests/theia-problems-view.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-quick-command.test.ts b/examples/playwright/src/tests/theia-quick-command.test.ts index b7ec80a0495f4..fcd2d026ad62e 100644 --- a/examples/playwright/src/tests/theia-quick-command.test.ts +++ b/examples/playwright/src/tests/theia-quick-command.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-sample-app.test.ts b/examples/playwright/src/tests/theia-sample-app.test.ts index 7670625a8d8e8..356d80f454662 100644 --- a/examples/playwright/src/tests/theia-sample-app.test.ts +++ b/examples/playwright/src/tests/theia-sample-app.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-status-bar.test.ts b/examples/playwright/src/tests/theia-status-bar.test.ts index 3d0bd054599f7..20f575ed7cad1 100644 --- a/examples/playwright/src/tests/theia-status-bar.test.ts +++ b/examples/playwright/src/tests/theia-status-bar.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-terminal-view.test.ts b/examples/playwright/src/tests/theia-terminal-view.test.ts index 0fa39a89d8bea..807e35a3c9e15 100644 --- a/examples/playwright/src/tests/theia-terminal-view.test.ts +++ b/examples/playwright/src/tests/theia-terminal-view.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-text-editor.test.ts b/examples/playwright/src/tests/theia-text-editor.test.ts index 1e95730feaaa3..d47daf09bb129 100644 --- a/examples/playwright/src/tests/theia-text-editor.test.ts +++ b/examples/playwright/src/tests/theia-text-editor.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-toolbar.test.ts b/examples/playwright/src/tests/theia-toolbar.test.ts index a1a7c6b8b05ef..1d5234c09208d 100644 --- a/examples/playwright/src/tests/theia-toolbar.test.ts +++ b/examples/playwright/src/tests/theia-toolbar.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/tests/theia-workspace.test.ts b/examples/playwright/src/tests/theia-workspace.test.ts index 189ee979614bc..02ae0f94c4f9b 100644 --- a/examples/playwright/src/tests/theia-workspace.test.ts +++ b/examples/playwright/src/tests/theia-workspace.test.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from '@playwright/test'; diff --git a/examples/playwright/src/theia-about-dialog.ts b/examples/playwright/src/theia-about-dialog.ts index 70473754ba7d9..99c915920665e 100644 --- a/examples/playwright/src/theia-about-dialog.ts +++ b/examples/playwright/src/theia-about-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaDialog } from './theia-dialog'; diff --git a/examples/playwright/src/theia-app.ts b/examples/playwright/src/theia-app.ts index 5cb93716de39d..901a7a172dbc2 100644 --- a/examples/playwright/src/theia-app.ts +++ b/examples/playwright/src/theia-app.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Page } from '@playwright/test'; diff --git a/examples/playwright/src/theia-context-menu.ts b/examples/playwright/src/theia-context-menu.ts index 9c66b60fdaf52..20208ed75377c 100644 --- a/examples/playwright/src/theia-context-menu.ts +++ b/examples/playwright/src/theia-context-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-dialog.ts b/examples/playwright/src/theia-dialog.ts index 6771980da9a45..0c3e4ceb141e8 100644 --- a/examples/playwright/src/theia-dialog.ts +++ b/examples/playwright/src/theia-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-editor.ts b/examples/playwright/src/theia-editor.ts index c7950e9d09f42..005328b2e9e73 100644 --- a/examples/playwright/src/theia-editor.ts +++ b/examples/playwright/src/theia-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaDialog } from './theia-dialog'; diff --git a/examples/playwright/src/theia-explorer-view.ts b/examples/playwright/src/theia-explorer-view.ts index 9a5d895161156..5bcb3fbebe874 100644 --- a/examples/playwright/src/theia-explorer-view.ts +++ b/examples/playwright/src/theia-explorer-view.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-main-menu.ts b/examples/playwright/src/theia-main-menu.ts index 6701e639c6cbe..428d8f148e0c8 100644 --- a/examples/playwright/src/theia-main-menu.ts +++ b/examples/playwright/src/theia-main-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-menu-item.ts b/examples/playwright/src/theia-menu-item.ts index 9e1f1eea1e1b0..8d814c5b7fd4f 100644 --- a/examples/playwright/src/theia-menu-item.ts +++ b/examples/playwright/src/theia-menu-item.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-menu.ts b/examples/playwright/src/theia-menu.ts index 0df36a1ed08e9..74747e03ac01a 100644 --- a/examples/playwright/src/theia-menu.ts +++ b/examples/playwright/src/theia-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-monaco-editor.ts b/examples/playwright/src/theia-monaco-editor.ts index d246305e7405a..ac0fd5290453b 100644 --- a/examples/playwright/src/theia-monaco-editor.ts +++ b/examples/playwright/src/theia-monaco-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-notification-indicator.ts b/examples/playwright/src/theia-notification-indicator.ts index d8b6d92cbadf0..37fb646515c17 100644 --- a/examples/playwright/src/theia-notification-indicator.ts +++ b/examples/playwright/src/theia-notification-indicator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaStatusIndicator } from './theia-status-indicator'; diff --git a/examples/playwright/src/theia-notification-overlay.ts b/examples/playwright/src/theia-notification-overlay.ts index bf0369ff30aa3..24b66e6c4a8ef 100644 --- a/examples/playwright/src/theia-notification-overlay.ts +++ b/examples/playwright/src/theia-notification-overlay.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaApp } from './theia-app'; diff --git a/examples/playwright/src/theia-output-channel.ts b/examples/playwright/src/theia-output-channel.ts index edc448dd2063f..6fc654c8096ab 100644 --- a/examples/playwright/src/theia-output-channel.ts +++ b/examples/playwright/src/theia-output-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-output-view.ts b/examples/playwright/src/theia-output-view.ts index 09e57bb23c341..514a19bf549da 100644 --- a/examples/playwright/src/theia-output-view.ts +++ b/examples/playwright/src/theia-output-view.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaApp } from './theia-app'; diff --git a/examples/playwright/src/theia-page-object.ts b/examples/playwright/src/theia-page-object.ts index a789f8f04efcf..0b67b0d1b9689 100644 --- a/examples/playwright/src/theia-page-object.ts +++ b/examples/playwright/src/theia-page-object.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Page } from '@playwright/test'; diff --git a/examples/playwright/src/theia-preference-view.ts b/examples/playwright/src/theia-preference-view.ts index 179ae0ba8206e..a32a7c56e23a4 100644 --- a/examples/playwright/src/theia-preference-view.ts +++ b/examples/playwright/src/theia-preference-view.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-problem-indicator.ts b/examples/playwright/src/theia-problem-indicator.ts index c7fb198aaaf50..8e67d6504c1d3 100644 --- a/examples/playwright/src/theia-problem-indicator.ts +++ b/examples/playwright/src/theia-problem-indicator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-problem-view.ts b/examples/playwright/src/theia-problem-view.ts index 4bd3ee95629a8..b0766c530f84c 100644 --- a/examples/playwright/src/theia-problem-view.ts +++ b/examples/playwright/src/theia-problem-view.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaApp } from './theia-app'; diff --git a/examples/playwright/src/theia-quick-command-palette.ts b/examples/playwright/src/theia-quick-command-palette.ts index a74f79316af51..2728bb0b00d21 100644 --- a/examples/playwright/src/theia-quick-command-palette.ts +++ b/examples/playwright/src/theia-quick-command-palette.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-rename-dialog.ts b/examples/playwright/src/theia-rename-dialog.ts index 411f24de7ac48..22114444342b5 100644 --- a/examples/playwright/src/theia-rename-dialog.ts +++ b/examples/playwright/src/theia-rename-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaDialog } from './theia-dialog'; diff --git a/examples/playwright/src/theia-status-bar.ts b/examples/playwright/src/theia-status-bar.ts index 516b3d62fae9c..0abff5fe5c7fb 100644 --- a/examples/playwright/src/theia-status-bar.ts +++ b/examples/playwright/src/theia-status-bar.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-status-indicator.ts b/examples/playwright/src/theia-status-indicator.ts index 926a247fa6a50..7788d11eb0379 100644 --- a/examples/playwright/src/theia-status-indicator.ts +++ b/examples/playwright/src/theia-status-indicator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-terminal.ts b/examples/playwright/src/theia-terminal.ts index 18d874393ff77..053cc63a46524 100644 --- a/examples/playwright/src/theia-terminal.ts +++ b/examples/playwright/src/theia-terminal.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-text-editor.ts b/examples/playwright/src/theia-text-editor.ts index 772324423f519..51ae79b84161c 100644 --- a/examples/playwright/src/theia-text-editor.ts +++ b/examples/playwright/src/theia-text-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-toggle-bottom-indicator.ts b/examples/playwright/src/theia-toggle-bottom-indicator.ts index 971b1d74d9558..19fd2ec40b678 100644 --- a/examples/playwright/src/theia-toggle-bottom-indicator.ts +++ b/examples/playwright/src/theia-toggle-bottom-indicator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TheiaStatusIndicator } from './theia-status-indicator'; diff --git a/examples/playwright/src/theia-toolbar-item.ts b/examples/playwright/src/theia-toolbar-item.ts index 5d083539511f7..fe6408b245123 100644 --- a/examples/playwright/src/theia-toolbar-item.ts +++ b/examples/playwright/src/theia-toolbar-item.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-toolbar.ts b/examples/playwright/src/theia-toolbar.ts index a470590d29fda..97fda9c8a1872 100644 --- a/examples/playwright/src/theia-toolbar.ts +++ b/examples/playwright/src/theia-toolbar.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-tree-node.ts b/examples/playwright/src/theia-tree-node.ts index 5637e6fb8caa5..6114bbbf89c12 100644 --- a/examples/playwright/src/theia-tree-node.ts +++ b/examples/playwright/src/theia-tree-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-view.ts b/examples/playwright/src/theia-view.ts index 00660fa285a9f..c89e7ef5aa4f7 100644 --- a/examples/playwright/src/theia-view.ts +++ b/examples/playwright/src/theia-view.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/examples/playwright/src/theia-workspace.ts b/examples/playwright/src/theia-workspace.ts index 1395fea88d35b..f7385bca5f84f 100644 --- a/examples/playwright/src/theia-workspace.ts +++ b/examples/playwright/src/theia-workspace.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs-extra'; diff --git a/examples/playwright/src/util.ts b/examples/playwright/src/util.ts index 2ccbe8c684925..36678a45da60e 100644 --- a/examples/playwright/src/util.ts +++ b/examples/playwright/src/util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementHandle } from '@playwright/test'; diff --git a/logo/theia-logo-gray.svg b/logo/theia-logo-gray.svg index 156baac36b306..1915cda4272a5 100644 --- a/logo/theia-logo-gray.svg +++ b/logo/theia-logo-gray.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/logo/theia-logo-no-text-black.svg b/logo/theia-logo-no-text-black.svg index afecc56dd293e..bca01e39446be 100644 --- a/logo/theia-logo-no-text-black.svg +++ b/logo/theia-logo-no-text-black.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/logo/theia-logo-no-text-white.svg b/logo/theia-logo-no-text-white.svg index a6cde7dd05b4e..62eb82fd4a730 100644 --- a/logo/theia-logo-no-text-white.svg +++ b/logo/theia-logo-no-text-white.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/logo/theia-logo-white.svg b/logo/theia-logo-white.svg index fe34145124a08..a88f1e655b002 100644 --- a/logo/theia-logo-white.svg +++ b/logo/theia-logo-white.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/logo/theia-logo.svg b/logo/theia-logo.svg index f39c4e74ca5ff..8d6b150a81d6b 100644 --- a/logo/theia-logo.svg +++ b/logo/theia-logo.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/logo/theia.svg b/logo/theia.svg index f1c76e6d2b45c..b0934fa4c84e2 100644 --- a/logo/theia.svg +++ b/logo/theia.svg @@ -13,7 +13,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/packages/bulk-edit/package.json b/packages/bulk-edit/package.json index 68e481a7407e6..58c50570ed167 100644 --- a/packages/bulk-edit/package.json +++ b/packages/bulk-edit/package.json @@ -21,7 +21,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/bulk-edit/src/browser/bulk-edit-commands.ts b/packages/bulk-edit/src/browser/bulk-edit-commands.ts index bbdef88573a70..2c3b03b33ba65 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-commands.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codicon } from '@theia/core/lib/browser'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-contribution.ts b/packages/bulk-edit/src/browser/bulk-edit-contribution.ts index d60d675992517..dbe3acc339e18 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-contribution.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-frontend-module.ts b/packages/bulk-edit/src/browser/bulk-edit-frontend-module.ts index 7167b1ab6cff9..649256ceb4d72 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-frontend-module.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; import { WidgetFactory } from '@theia/core/lib/browser/widget-manager'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree-label-provider.ts b/packages/bulk-edit/src/browser/bulk-edit-tree-label-provider.ts index 4e8ea472b1513..ccf29a655e51a 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree-label-provider.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-node-selection.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-node-selection.ts index 04ef24c8f7755..f0f15558edb9f 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-node-selection.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-node-selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SelectionService } from '@theia/core/lib/common/selection-service'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-container.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-container.ts index ec54eb000d461..f00a32d769b5e 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-container.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-model.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-model.ts index c98a13cc8cfa9..9db3bb6e0f11c 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-model.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-widget.tsx b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-widget.tsx index e8a7a7935412c..ff4bd3ae0eace 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-widget.tsx +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.spec.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.spec.ts index 1a2516573d229..49f38561ec75c 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.spec.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.ts index b224da25a69d0..b44e0bbb7254c 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/bulk-edit/src/browser/bulk-edit-tree/index.ts b/packages/bulk-edit/src/browser/bulk-edit-tree/index.ts index 2b9100c8d44ae..af52817e31cab 100644 --- a/packages/bulk-edit/src/browser/bulk-edit-tree/index.ts +++ b/packages/bulk-edit/src/browser/bulk-edit-tree/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './bulk-edit-tree'; diff --git a/packages/bulk-edit/src/browser/style/bulk-edit.css b/packages/bulk-edit/src/browser/style/bulk-edit.css index 54cb762494a80..1c9969d082bc1 100644 --- a/packages/bulk-edit/src/browser/style/bulk-edit.css +++ b/packages/bulk-edit/src/browser/style/bulk-edit.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-bulk-edit-container { diff --git a/packages/callhierarchy/package.json b/packages/callhierarchy/package.json index bfc46753338db..d8889db45123b 100644 --- a/packages/callhierarchy/package.json +++ b/packages/callhierarchy/package.json @@ -18,7 +18,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/callhierarchy/src/browser/callhierarchy-contribution.ts b/packages/callhierarchy/src/browser/callhierarchy-contribution.ts index bc9c51076960f..bd37b1bcec0ca 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-contribution.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-frontend-module.ts b/packages/callhierarchy/src/browser/callhierarchy-frontend-module.ts index 299cc6c5b6f36..80b1c1617db73 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-frontend-module.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CallHierarchyContribution } from './callhierarchy-contribution'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-service.ts b/packages/callhierarchy/src/browser/callhierarchy-service.ts index 93a014f0fc62e..1babd231497ee 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-service.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-container.ts b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-container.ts index 40b2e9f09eaf5..dcfc2799db672 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-container.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts index 2873cca069ece..745cb94b96d61 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-widget.tsx b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-widget.tsx index 31e442ac23906..0fc2c77a8c79e 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-widget.tsx +++ b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree.ts b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree.ts index e16f931bf9309..90b272d2132db 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-tree/callhierarchy-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/callhierarchy/src/browser/callhierarchy-tree/index.ts b/packages/callhierarchy/src/browser/callhierarchy-tree/index.ts index 8a80e379f233d..62ac1ce64a91a 100644 --- a/packages/callhierarchy/src/browser/callhierarchy-tree/index.ts +++ b/packages/callhierarchy/src/browser/callhierarchy-tree/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './callhierarchy-tree'; diff --git a/packages/callhierarchy/src/browser/callhierarchy.ts b/packages/callhierarchy/src/browser/callhierarchy.ts index cb4f0ebb1ff5f..40bee1b0212b4 100644 --- a/packages/callhierarchy/src/browser/callhierarchy.ts +++ b/packages/callhierarchy/src/browser/callhierarchy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/callhierarchy/src/browser/index.ts b/packages/callhierarchy/src/browser/index.ts index d67f5c2447e99..0d135632aa883 100644 --- a/packages/callhierarchy/src/browser/index.ts +++ b/packages/callhierarchy/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './callhierarchy'; diff --git a/packages/callhierarchy/src/browser/style/index.css b/packages/callhierarchy/src/browser/style/index.css index 658706f73c210..dc36981aac9ec 100644 --- a/packages/callhierarchy/src/browser/style/index.css +++ b/packages/callhierarchy/src/browser/style/index.css @@ -11,53 +11,55 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-CallHierarchyTree { - font-size: var(--theia-ui-font-size1); + font-size: var(--theia-ui-font-size1); } .theia-CallHierarchyTree .theia-TreeNode { - width: 100%; + width: 100%; } .theia-CallHierarchyTree .theia-ExpansionToggle { - min-width: 9px; - padding-right: 4px; + min-width: 9px; + padding-right: 4px; } .theia-CallHierarchyTree .definitionNode { - display: flex; + display: flex; } .theia-CallHierarchyTree .definitionNode { - width: calc(100% - 32px); + width: calc(100% - 32px); } .theia-CallHierarchyTree .definitionNode div { - margin-right: 5px; + margin-right: 5px; } .theia-CallHierarchyTree .definitionNode .symbol { - padding-right: 4px; + padding-right: 4px; } .theia-CallHierarchyTree .definitionNode .referenceCount { - color: var(--theia-badge-background); - padding-right: 4px; + color: var(--theia-badge-background); + padding-right: 4px; } .theia-CallHierarchyTree .definitionNode .container { - color: var(--theia-descriptionForeground); + color: var(--theia-descriptionForeground); } .theia-CallHierarchyTree .definitionNode-content { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -.theia-CallHierarchyTree .definitionNode.deprecatedDefinition .definitionNode-content { - text-decoration: line-through; +.theia-CallHierarchyTree + .definitionNode.deprecatedDefinition + .definitionNode-content { + text-decoration: line-through; } diff --git a/packages/callhierarchy/src/browser/utils.ts b/packages/callhierarchy/src/browser/utils.ts index 8b9d0d5d5650e..a30cb54fa8197 100644 --- a/packages/callhierarchy/src/browser/utils.ts +++ b/packages/callhierarchy/src/browser/utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Location, Range, Position } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/callhierarchy/src/package.spec.ts b/packages/callhierarchy/src/package.spec.ts index ca83b237d1426..c394c3023deac 100644 --- a/packages/callhierarchy/src/package.spec.ts +++ b/packages/callhierarchy/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/console/package.json b/packages/console/package.json index 30e6524e716b2..6c5f740002300 100644 --- a/packages/console/package.json +++ b/packages/console/package.json @@ -19,7 +19,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/console/src/browser/ansi-console-item.tsx b/packages/console/src/browser/ansi-console-item.tsx index ba07a47e7a402..9c57cad9afae3 100644 --- a/packages/console/src/browser/ansi-console-item.tsx +++ b/packages/console/src/browser/ansi-console-item.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/console/src/browser/console-content-widget.tsx b/packages/console/src/browser/console-content-widget.tsx index 1506a33ade438..e9e3f0a4c3271 100644 --- a/packages/console/src/browser/console-content-widget.tsx +++ b/packages/console/src/browser/console-content-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Message } from '@theia/core/shared/@phosphor/messaging'; diff --git a/packages/console/src/browser/console-contribution.ts b/packages/console/src/browser/console-contribution.ts index f45f267410787..bc68cec19ce40 100644 --- a/packages/console/src/browser/console-contribution.ts +++ b/packages/console/src/browser/console-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-frontend-module.ts b/packages/console/src/browser/console-frontend-module.ts index 6ee11d220dd69..2cee38f9362e3 100644 --- a/packages/console/src/browser/console-frontend-module.ts +++ b/packages/console/src/browser/console-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-history.ts b/packages/console/src/browser/console-history.ts index e2e0da19e9d7d..af51b36ca4c6f 100644 --- a/packages/console/src/browser/console-history.ts +++ b/packages/console/src/browser/console-history.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-keybinding-contexts.ts b/packages/console/src/browser/console-keybinding-contexts.ts index 312eb3b0bc59a..755c569707bbb 100644 --- a/packages/console/src/browser/console-keybinding-contexts.ts +++ b/packages/console/src/browser/console-keybinding-contexts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-manager.ts b/packages/console/src/browser/console-manager.ts index 2ffc3d209f417..30d4cfe03e9b1 100644 --- a/packages/console/src/browser/console-manager.ts +++ b/packages/console/src/browser/console-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-session-manager.ts b/packages/console/src/browser/console-session-manager.ts index e0130ad22834a..2ff2423e24269 100644 --- a/packages/console/src/browser/console-session-manager.ts +++ b/packages/console/src/browser/console-session-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-session.ts b/packages/console/src/browser/console-session.ts index f121f83742062..7ca7b02628e97 100644 --- a/packages/console/src/browser/console-session.ts +++ b/packages/console/src/browser/console-session.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/console/src/browser/console-widget.ts b/packages/console/src/browser/console-widget.ts index 2cd70ddc3c11c..ed508a7f1ec71 100644 --- a/packages/console/src/browser/console-widget.ts +++ b/packages/console/src/browser/console-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElementExt } from '@theia/core/shared/@phosphor/domutils'; diff --git a/packages/console/src/browser/style/index.css b/packages/console/src/browser/style/index.css index b81b6460e8f9e..9ad79389acde3 100644 --- a/packages/console/src/browser/style/index.css +++ b/packages/console/src/browser/style/index.css @@ -11,39 +11,39 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-console-content { - font-size: var(--theia-code-font-size); - line-height: var(--theia-code-line-height); - font-family: var(--theia-code-font-family); + font-size: var(--theia-code-font-size); + line-height: var(--theia-code-line-height); + font-family: var(--theia-code-font-family); } .theia-console-input { - padding-left: 20px; - border-top: var(--theia-panel-border-width) solid var(--theia-panel-border); - height: calc(var(--theia-content-line-height)*2); - display: flex; - align-items: center; + padding-left: 20px; + border-top: var(--theia-panel-border-width) solid var(--theia-panel-border); + height: calc(var(--theia-content-line-height) * 2); + display: flex; + align-items: center; } .theia-console-input:before { - left: 8px; - top: 3px; - position: absolute; - content: '\276f'; - line-height: 18px; + left: 8px; + top: 3px; + position: absolute; + content: "\276f"; + line-height: 18px; } .theia-console-error { - color: var(--theia-errorForeground); + color: var(--theia-errorForeground); } .theia-console-warning { - color: var(--theia-editorWarning-foreground); + color: var(--theia-editorWarning-foreground); } .theia-console-ansi-console-item { - white-space: pre-wrap; + white-space: pre-wrap; } diff --git a/packages/console/src/package.spec.ts b/packages/console/src/package.spec.ts index 2f9a465e7976c..b18335b3ecc04 100644 --- a/packages/console/src/package.spec.ts +++ b/packages/console/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/core/package.json b/packages/core/package.json index 0de85da3ddadd..977811ac0028e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -170,7 +170,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/core/scripts/generate-layout.js b/packages/core/scripts/generate-layout.js index d82b3d8dc6f28..c7f8f3e3ad577 100644 --- a/packages/core/scripts/generate-layout.js +++ b/packages/core/scripts/generate-layout.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const parseArgs = require('minimist'); diff --git a/packages/core/src/browser/about-dialog.tsx b/packages/core/src/browser/about-dialog.tsx index 36c0fcfbf660e..7d8899581a8bf 100644 --- a/packages/core/src/browser/about-dialog.tsx +++ b/packages/core/src/browser/about-dialog.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/authentication-service.ts b/packages/core/src/browser/authentication-service.ts index fb375b7601994..e9595b816248f 100644 --- a/packages/core/src/browser/authentication-service.ts +++ b/packages/core/src/browser/authentication-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/core/src/browser/breadcrumbs/breadcrumb-popup-container.ts b/packages/core/src/browser/breadcrumbs/breadcrumb-popup-container.ts index 57ea1367ebc15..09a8813105287 100644 --- a/packages/core/src/browser/breadcrumbs/breadcrumb-popup-container.ts +++ b/packages/core/src/browser/breadcrumbs/breadcrumb-popup-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '../../../shared/inversify'; diff --git a/packages/core/src/browser/breadcrumbs/breadcrumb-renderer.tsx b/packages/core/src/browser/breadcrumbs/breadcrumb-renderer.tsx index 99aba18085553..2960f935fa376 100644 --- a/packages/core/src/browser/breadcrumbs/breadcrumb-renderer.tsx +++ b/packages/core/src/browser/breadcrumbs/breadcrumb-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/breadcrumbs/breadcrumbs-constants.ts b/packages/core/src/browser/breadcrumbs/breadcrumbs-constants.ts index 79c64f4e57166..b80b9b8dd063b 100644 --- a/packages/core/src/browser/breadcrumbs/breadcrumbs-constants.ts +++ b/packages/core/src/browser/breadcrumbs/breadcrumbs-constants.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MaybePromise, Event } from '../../common'; diff --git a/packages/core/src/browser/breadcrumbs/breadcrumbs-renderer.tsx b/packages/core/src/browser/breadcrumbs/breadcrumbs-renderer.tsx index 1166d4dbf324c..fef2d69de465f 100644 --- a/packages/core/src/browser/breadcrumbs/breadcrumbs-renderer.tsx +++ b/packages/core/src/browser/breadcrumbs/breadcrumbs-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/breadcrumbs/breadcrumbs-service.ts b/packages/core/src/browser/breadcrumbs/breadcrumbs-service.ts index 9c57d9b6ab955..a4774af689455 100644 --- a/packages/core/src/browser/breadcrumbs/breadcrumbs-service.ts +++ b/packages/core/src/browser/breadcrumbs/breadcrumbs-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/breadcrumbs/index.ts b/packages/core/src/browser/breadcrumbs/index.ts index 91daad06ef455..43c17b4be0fe5 100644 --- a/packages/core/src/browser/breadcrumbs/index.ts +++ b/packages/core/src/browser/breadcrumbs/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './breadcrumb-popup-container'; diff --git a/packages/core/src/browser/browser-clipboard-service.ts b/packages/core/src/browser/browser-clipboard-service.ts index 493ba672d34ad..687bac9bf96cf 100644 --- a/packages/core/src/browser/browser-clipboard-service.ts +++ b/packages/core/src/browser/browser-clipboard-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/browser.ts b/packages/core/src/browser/browser.ts index 3a054f05f5196..eace2b5f2670d 100644 --- a/packages/core/src/browser/browser.ts +++ b/packages/core/src/browser/browser.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/browser/clipboard-service.ts b/packages/core/src/browser/clipboard-service.ts index 904133a2e9231..a038efb0c8f68 100644 --- a/packages/core/src/browser/clipboard-service.ts +++ b/packages/core/src/browser/clipboard-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MaybePromise } from '../common/types'; diff --git a/packages/core/src/browser/color-application-contribution.ts b/packages/core/src/browser/color-application-contribution.ts index 2091116c5efb9..73b3d8b70f919 100644 --- a/packages/core/src/browser/color-application-contribution.ts +++ b/packages/core/src/browser/color-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/color-registry.ts b/packages/core/src/browser/color-registry.ts index 049e469cde225..18ea3211d0d73 100644 --- a/packages/core/src/browser/color-registry.ts +++ b/packages/core/src/browser/color-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/command-open-handler.ts b/packages/core/src/browser/command-open-handler.ts index 18b1fbadf0606..f3e7323b04c07 100644 --- a/packages/core/src/browser/command-open-handler.ts +++ b/packages/core/src/browser/command-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/common-frontend-contribution.ts b/packages/core/src/browser/common-frontend-contribution.ts index 57723845f3aef..d94d690d47d8a 100644 --- a/packages/core/src/browser/common-frontend-contribution.ts +++ b/packages/core/src/browser/common-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable max-len, @typescript-eslint/indent */ diff --git a/packages/core/src/browser/common-styling-participants.ts b/packages/core/src/browser/common-styling-participants.ts index e8417ea53f8d7..7ad9951a393c8 100644 --- a/packages/core/src/browser/common-styling-participants.ts +++ b/packages/core/src/browser/common-styling-participants.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces } from 'inversify'; diff --git a/packages/core/src/browser/connection-status-service.spec.ts b/packages/core/src/browser/connection-status-service.spec.ts index df8e6001e4342..2d570f0ec62f6 100644 --- a/packages/core/src/browser/connection-status-service.spec.ts +++ b/packages/core/src/browser/connection-status-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../browser/test/jsdom'; @@ -171,7 +171,7 @@ describe('frontend-connection-status', function (): void { sinon.assert.calledOnce(pingSpy); }); - it('should not perform ping request before desired timeout', () => { + it('should not perform ping request before desired timeout', () => { const frontendConnectionStatusService = testContainer.get(FrontendConnectionStatusService); frontendConnectionStatusService['init'](); mockIncomingMessageActivityEmitter.fire(undefined); diff --git a/packages/core/src/browser/connection-status-service.ts b/packages/core/src/browser/connection-status-service.ts index 084bc66ee1a3d..55794d9936241 100644 --- a/packages/core/src/browser/connection-status-service.ts +++ b/packages/core/src/browser/connection-status-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/context-key-service.ts b/packages/core/src/browser/context-key-service.ts index 774ae36b73f61..9ed540beb5394 100644 --- a/packages/core/src/browser/context-key-service.ts +++ b/packages/core/src/browser/context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/context-menu-renderer.ts b/packages/core/src/browser/context-menu-renderer.ts index 32918102b7c5f..d0caac8e1a5bd 100644 --- a/packages/core/src/browser/context-menu-renderer.ts +++ b/packages/core/src/browser/context-menu-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/core-preferences.ts b/packages/core/src/browser/core-preferences.ts index b1a610fb8c3c3..5b81d80ea1d48 100644 --- a/packages/core/src/browser/core-preferences.ts +++ b/packages/core/src/browser/core-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/browser/credentials-service.ts b/packages/core/src/browser/credentials-service.ts index 1950dbc9ceba9..dbe7793aed9c7 100644 --- a/packages/core/src/browser/credentials-service.ts +++ b/packages/core/src/browser/credentials-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- @@ -82,7 +82,7 @@ export class CredentialsServiceImpl implements CredentialsService { class KeytarCredentialsProvider implements CredentialsProvider { - constructor(private readonly keytarService: KeytarService) {} + constructor(private readonly keytarService: KeytarService) { } deletePassword(service: string, account: string): Promise { return this.keytarService.deletePassword(service, account); diff --git a/packages/core/src/browser/decoration-style.ts b/packages/core/src/browser/decoration-style.ts index f53625a3407e8..cf9bb423fa512 100644 --- a/packages/core/src/browser/decoration-style.ts +++ b/packages/core/src/browser/decoration-style.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace DecorationStyle { diff --git a/packages/core/src/browser/decorations-service.ts b/packages/core/src/browser/decorations-service.ts index 723893dafb680..0d175dd20b4fb 100644 --- a/packages/core/src/browser/decorations-service.ts +++ b/packages/core/src/browser/decorations-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/dialogs.ts b/packages/core/src/browser/dialogs.ts index 65f420f0f5473..a8e626b608827 100644 --- a/packages/core/src/browser/dialogs.ts +++ b/packages/core/src/browser/dialogs.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/dialogs/react-dialog.tsx b/packages/core/src/browser/dialogs/react-dialog.tsx index 3fea21858d7b8..843d27f3c0871 100644 --- a/packages/core/src/browser/dialogs/react-dialog.tsx +++ b/packages/core/src/browser/dialogs/react-dialog.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/diff-uris.ts b/packages/core/src/browser/diff-uris.ts index c66d6d92d0028..6b72336f78748 100644 --- a/packages/core/src/browser/diff-uris.ts +++ b/packages/core/src/browser/diff-uris.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/encoding-registry.ts b/packages/core/src/browser/encoding-registry.ts index 22132fbedd36e..00ebb357b6c25 100644 --- a/packages/core/src/browser/encoding-registry.ts +++ b/packages/core/src/browser/encoding-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/browser/endpoint.spec.ts b/packages/core/src/browser/endpoint.spec.ts index ced2482eb71d6..c009e0173985b 100644 --- a/packages/core/src/browser/endpoint.spec.ts +++ b/packages/core/src/browser/endpoint.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/browser/endpoint.ts b/packages/core/src/browser/endpoint.ts index 7df6c45ac3757..cf9cbb79601b7 100644 --- a/packages/core/src/browser/endpoint.ts +++ b/packages/core/src/browser/endpoint.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '../common/uri'; diff --git a/packages/core/src/browser/external-uri-service.ts b/packages/core/src/browser/external-uri-service.ts index de8b4bee7b43a..315fc2299e3f1 100644 --- a/packages/core/src/browser/external-uri-service.ts +++ b/packages/core/src/browser/external-uri-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { environment } from '@theia/application-package/lib/environment'; diff --git a/packages/core/src/browser/file-icons-js.d.ts b/packages/core/src/browser/file-icons-js.d.ts index 646fe812be4cb..05d87ddb897b3 100644 --- a/packages/core/src/browser/file-icons-js.d.ts +++ b/packages/core/src/browser/file-icons-js.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** declare module 'file-icons-js' { diff --git a/packages/core/src/browser/frontend-application-bindings.ts b/packages/core/src/browser/frontend-application-bindings.ts index b9f6df9af7272..f005abf3f1e9d 100644 --- a/packages/core/src/browser/frontend-application-bindings.ts +++ b/packages/core/src/browser/frontend-application-bindings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/browser/frontend-application-config-provider.spec.ts b/packages/core/src/browser/frontend-application-config-provider.spec.ts index 60e2a19f86e46..560bbf1f7f56f 100644 --- a/packages/core/src/browser/frontend-application-config-provider.spec.ts +++ b/packages/core/src/browser/frontend-application-config-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../browser/test/jsdom'; diff --git a/packages/core/src/browser/frontend-application-config-provider.ts b/packages/core/src/browser/frontend-application-config-provider.ts index 12d0ad0ce7ad3..e607010fcba40 100644 --- a/packages/core/src/browser/frontend-application-config-provider.ts +++ b/packages/core/src/browser/frontend-application-config-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationConfig, deepmerge } from '@theia/application-package/lib/application-props'; diff --git a/packages/core/src/browser/frontend-application-module.ts b/packages/core/src/browser/frontend-application-module.ts index 8240b681327d9..595738d4803ee 100644 --- a/packages/core/src/browser/frontend-application-module.ts +++ b/packages/core/src/browser/frontend-application-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/core/src/browser/frontend-application-state.ts b/packages/core/src/browser/frontend-application-state.ts index 6611be2246e90..2673227fdc8c2 100644 --- a/packages/core/src/browser/frontend-application-state.ts +++ b/packages/core/src/browser/frontend-application-state.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/frontend-application.ts b/packages/core/src/browser/frontend-application.ts index 23d5f9a20608e..791bc6d501a0e 100644 --- a/packages/core/src/browser/frontend-application.ts +++ b/packages/core/src/browser/frontend-application.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/browser/hover-service.ts b/packages/core/src/browser/hover-service.ts index 789a506d4b277..360a004dd6b32 100644 --- a/packages/core/src/browser/hover-service.ts +++ b/packages/core/src/browser/hover-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; @@ -61,7 +61,7 @@ export interface HoverRequest { * Additional css classes that should be added to the hover box. * Used to style certain boxes different e.g. for the extended tab preview. */ - cssClasses?: string [] + cssClasses?: string[] } @injectable() diff --git a/packages/core/src/browser/http-open-handler.ts b/packages/core/src/browser/http-open-handler.ts index 45ae0bac38aee..e31b1f9bdc89d 100644 --- a/packages/core/src/browser/http-open-handler.ts +++ b/packages/core/src/browser/http-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/i18n/i18n-frontend-module.ts b/packages/core/src/browser/i18n/i18n-frontend-module.ts index 7f8ba9f6f69db..a89d00c3cd156 100644 --- a/packages/core/src/browser/i18n/i18n-frontend-module.ts +++ b/packages/core/src/browser/i18n/i18n-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/i18n/language-quick-pick-service.ts b/packages/core/src/browser/i18n/language-quick-pick-service.ts index c9d9af8016aa9..88210abbb4660 100644 --- a/packages/core/src/browser/i18n/language-quick-pick-service.ts +++ b/packages/core/src/browser/i18n/language-quick-pick-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/icon-theme-contribution.ts b/packages/core/src/browser/icon-theme-contribution.ts index 4989c30a3b4fd..3c1dda5465f30 100644 --- a/packages/core/src/browser/icon-theme-contribution.ts +++ b/packages/core/src/browser/icon-theme-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/icon-theme-service.ts b/packages/core/src/browser/icon-theme-service.ts index 55d8a74bb81d1..2df1efdcf4806 100644 --- a/packages/core/src/browser/icon-theme-service.ts +++ b/packages/core/src/browser/icon-theme-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/index.ts b/packages/core/src/browser/index.ts index 6ddc2c5d1812c..d2a119ea80da9 100644 --- a/packages/core/src/browser/index.ts +++ b/packages/core/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './shell'; diff --git a/packages/core/src/browser/json-schema-store.ts b/packages/core/src/browser/json-schema-store.ts index 743c4dc50b741..40e929b3fe294 100644 --- a/packages/core/src/browser/json-schema-store.ts +++ b/packages/core/src/browser/json-schema-store.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/keybinding.spec.ts b/packages/core/src/browser/keybinding.spec.ts index 21e996e34dfa7..b556a505c849b 100644 --- a/packages/core/src/browser/keybinding.spec.ts +++ b/packages/core/src/browser/keybinding.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from './test/jsdom'; diff --git a/packages/core/src/browser/keybinding.ts b/packages/core/src/browser/keybinding.ts index a61922ed22b0a..05e0c0af72ca4 100644 --- a/packages/core/src/browser/keybinding.ts +++ b/packages/core/src/browser/keybinding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/browser-keyboard-frontend-contribution.ts b/packages/core/src/browser/keyboard/browser-keyboard-frontend-contribution.ts index d333c70cc7b6b..c6ba47d4fc681 100644 --- a/packages/core/src/browser/keyboard/browser-keyboard-frontend-contribution.ts +++ b/packages/core/src/browser/keyboard/browser-keyboard-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts b/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts index fad1d28577a41..4b19f1cd80f32 100644 --- a/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts +++ b/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../test/jsdom'; diff --git a/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.ts b/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.ts index 4672f6fa456f4..80ac9e0d02095 100644 --- a/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.ts +++ b/packages/core/src/browser/keyboard/browser-keyboard-layout-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct, inject } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/browser-keyboard-module.ts b/packages/core/src/browser/keyboard/browser-keyboard-module.ts index be476dea2c79a..5609d63c22b24 100644 --- a/packages/core/src/browser/keyboard/browser-keyboard-module.ts +++ b/packages/core/src/browser/keyboard/browser-keyboard-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/index.ts b/packages/core/src/browser/keyboard/index.ts index 11979db3554b7..d01d68399e9c9 100644 --- a/packages/core/src/browser/keyboard/index.ts +++ b/packages/core/src/browser/keyboard/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './keys'; diff --git a/packages/core/src/browser/keyboard/keyboard-layout-service.spec.ts b/packages/core/src/browser/keyboard/keyboard-layout-service.spec.ts index 5e775a5aa4b28..ae4217362681a 100644 --- a/packages/core/src/browser/keyboard/keyboard-layout-service.spec.ts +++ b/packages/core/src/browser/keyboard/keyboard-layout-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, injectable } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/keyboard-layout-service.ts b/packages/core/src/browser/keyboard/keyboard-layout-service.ts index 894bb0cb34ff6..6866d95e7b071 100644 --- a/packages/core/src/browser/keyboard/keyboard-layout-service.ts +++ b/packages/core/src/browser/keyboard/keyboard-layout-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from 'inversify'; diff --git a/packages/core/src/browser/keyboard/keys.spec.ts b/packages/core/src/browser/keyboard/keys.spec.ts index 25b204155225e..3212b37ea00d2 100644 --- a/packages/core/src/browser/keyboard/keys.spec.ts +++ b/packages/core/src/browser/keyboard/keys.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../../browser/test/jsdom'; diff --git a/packages/core/src/browser/keyboard/keys.ts b/packages/core/src/browser/keyboard/keys.ts index 35c99f33ccbe9..356e184123da8 100644 --- a/packages/core/src/browser/keyboard/keys.ts +++ b/packages/core/src/browser/keyboard/keys.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/browser/keys.ts b/packages/core/src/browser/keys.ts index 714f950c72709..5a5286ab9f372 100644 --- a/packages/core/src/browser/keys.ts +++ b/packages/core/src/browser/keys.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Reexporting here for backwards compatibility. diff --git a/packages/core/src/browser/label-parser.spec.ts b/packages/core/src/browser/label-parser.spec.ts index ef119f3e17f4e..9224692b44665 100644 --- a/packages/core/src/browser/label-parser.spec.ts +++ b/packages/core/src/browser/label-parser.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { LabelParser, LabelPart, LabelIcon } from './label-parser'; import { CommandService } from './../common'; diff --git a/packages/core/src/browser/label-parser.ts b/packages/core/src/browser/label-parser.ts index a5032f8e9b18d..5918d60c59b7d 100644 --- a/packages/core/src/browser/label-parser.ts +++ b/packages/core/src/browser/label-parser.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; import { isObject, isString } from '../common'; diff --git a/packages/core/src/browser/label-provider.spec.ts b/packages/core/src/browser/label-provider.spec.ts index 98cd4eb5eb098..e95d4f467a0b8 100644 --- a/packages/core/src/browser/label-provider.spec.ts +++ b/packages/core/src/browser/label-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/label-provider.ts b/packages/core/src/browser/label-provider.ts index 0144f070406a5..35cf6860cced9 100644 --- a/packages/core/src/browser/label-provider.ts +++ b/packages/core/src/browser/label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/language-service.ts b/packages/core/src/browser/language-service.ts index 8273a1f235e5a..5897f779e4610 100644 --- a/packages/core/src/browser/language-service.ts +++ b/packages/core/src/browser/language-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/logger-frontend-module.ts b/packages/core/src/browser/logger-frontend-module.ts index dd1051a3e0e6d..c7fa9f0feb7e8 100644 --- a/packages/core/src/browser/logger-frontend-module.ts +++ b/packages/core/src/browser/logger-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, Container } from 'inversify'; diff --git a/packages/core/src/browser/markdown-rendering/markdown-renderer.ts b/packages/core/src/browser/markdown-rendering/markdown-renderer.ts index 20e2c3f4eb2d9..fa9eb5bcf031f 100644 --- a/packages/core/src/browser/markdown-rendering/markdown-renderer.ts +++ b/packages/core/src/browser/markdown-rendering/markdown-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as DOMPurify from 'dompurify'; diff --git a/packages/core/src/browser/menu/browser-context-menu-renderer.ts b/packages/core/src/browser/menu/browser-context-menu-renderer.ts index 44360de924a8a..63f3a35af36bc 100644 --- a/packages/core/src/browser/menu/browser-context-menu-renderer.ts +++ b/packages/core/src/browser/menu/browser-context-menu-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/menu/browser-menu-module.ts b/packages/core/src/browser/menu/browser-menu-module.ts index 0522ef36595ec..eaea9ee2a1b6a 100644 --- a/packages/core/src/browser/menu/browser-menu-module.ts +++ b/packages/core/src/browser/menu/browser-menu-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/menu/browser-menu-plugin.ts b/packages/core/src/browser/menu/browser-menu-plugin.ts index 6f93545673203..5af54f00fa3ca 100644 --- a/packages/core/src/browser/menu/browser-menu-plugin.ts +++ b/packages/core/src/browser/menu/browser-menu-plugin.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/menu/context-menu-context.ts b/packages/core/src/browser/menu/context-menu-context.ts index 6c134f1aa4bf8..0db96c8357abd 100644 --- a/packages/core/src/browser/menu/context-menu-context.ts +++ b/packages/core/src/browser/menu/context-menu-context.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/messaging/index.ts b/packages/core/src/browser/messaging/index.ts index 2796953abbf30..c2b82e9ab402d 100644 --- a/packages/core/src/browser/messaging/index.ts +++ b/packages/core/src/browser/messaging/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './ws-connection-provider'; diff --git a/packages/core/src/browser/messaging/messaging-frontend-module.ts b/packages/core/src/browser/messaging/messaging-frontend-module.ts index fc0c3a4512a89..97329ceccbed7 100644 --- a/packages/core/src/browser/messaging/messaging-frontend-module.ts +++ b/packages/core/src/browser/messaging/messaging-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/messaging/ws-connection-provider.ts b/packages/core/src/browser/messaging/ws-connection-provider.ts index b44e34841ee2c..66a6a518189a0 100644 --- a/packages/core/src/browser/messaging/ws-connection-provider.ts +++ b/packages/core/src/browser/messaging/ws-connection-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces, decorate, unmanaged } from 'inversify'; diff --git a/packages/core/src/browser/mime-service.ts b/packages/core/src/browser/mime-service.ts index dc1dad290ac0c..e14841b3fe75b 100644 --- a/packages/core/src/browser/mime-service.ts +++ b/packages/core/src/browser/mime-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/navigatable-types.ts b/packages/core/src/browser/navigatable-types.ts index 0104d4dde6dcf..159521463c498 100644 --- a/packages/core/src/browser/navigatable-types.ts +++ b/packages/core/src/browser/navigatable-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI, isObject, MaybeArray } from '../common'; diff --git a/packages/core/src/browser/navigatable.ts b/packages/core/src/browser/navigatable.ts index 8ad5d42b57e89..5e942d77e3c5f 100644 --- a/packages/core/src/browser/navigatable.ts +++ b/packages/core/src/browser/navigatable.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '../common/uri'; diff --git a/packages/core/src/browser/opener-service.spec.ts b/packages/core/src/browser/opener-service.spec.ts index 9c38605243b78..055018cb06448 100644 --- a/packages/core/src/browser/opener-service.spec.ts +++ b/packages/core/src/browser/opener-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DefaultOpenerService, OpenHandler } from './opener-service'; diff --git a/packages/core/src/browser/opener-service.ts b/packages/core/src/browser/opener-service.ts index 4035f013a2786..e15418e3e6b29 100644 --- a/packages/core/src/browser/opener-service.ts +++ b/packages/core/src/browser/opener-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { named, injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/performance/frontend-stopwatch.ts b/packages/core/src/browser/performance/frontend-stopwatch.ts index b2ce755e8b6f8..396c9fb9e7f19 100644 --- a/packages/core/src/browser/performance/frontend-stopwatch.ts +++ b/packages/core/src/browser/performance/frontend-stopwatch.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/performance/index.ts b/packages/core/src/browser/performance/index.ts index 19cee6dbd9f30..1a60df674805a 100644 --- a/packages/core/src/browser/performance/index.ts +++ b/packages/core/src/browser/performance/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './frontend-stopwatch'; diff --git a/packages/core/src/browser/performance/measurement-frontend-bindings.ts b/packages/core/src/browser/performance/measurement-frontend-bindings.ts index 6690ec216852a..834128f194ec5 100644 --- a/packages/core/src/browser/performance/measurement-frontend-bindings.ts +++ b/packages/core/src/browser/performance/measurement-frontend-bindings.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ import { interfaces } from 'inversify'; diff --git a/packages/core/src/browser/preferences/index.ts b/packages/core/src/browser/preferences/index.ts index 0b17457b420f5..013231bebfdb4 100644 --- a/packages/core/src/browser/preferences/index.ts +++ b/packages/core/src/browser/preferences/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './preference-service'; diff --git a/packages/core/src/browser/preferences/injectable-preference-proxy.ts b/packages/core/src/browser/preferences/injectable-preference-proxy.ts index 6759095dc3775..bad458d03020d 100644 --- a/packages/core/src/browser/preferences/injectable-preference-proxy.ts +++ b/packages/core/src/browser/preferences/injectable-preference-proxy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/preferences/preference-configurations.ts b/packages/core/src/browser/preferences/preference-configurations.ts index 25380ae2a3d72..ab49cd2df1d05 100644 --- a/packages/core/src/browser/preferences/preference-configurations.ts +++ b/packages/core/src/browser/preferences/preference-configurations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, interfaces } from 'inversify'; diff --git a/packages/core/src/browser/preferences/preference-contribution.ts b/packages/core/src/browser/preferences/preference-contribution.ts index b91b71aff265f..d3a329cabac9b 100644 --- a/packages/core/src/browser/preferences/preference-contribution.ts +++ b/packages/core/src/browser/preferences/preference-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as Ajv from 'ajv'; diff --git a/packages/core/src/browser/preferences/preference-language-override-service.ts b/packages/core/src/browser/preferences/preference-language-override-service.ts index ed6655c50a70b..e07c6b46a8b1f 100644 --- a/packages/core/src/browser/preferences/preference-language-override-service.ts +++ b/packages/core/src/browser/preferences/preference-language-override-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/preferences/preference-provider.spec.ts b/packages/core/src/browser/preferences/preference-provider.spec.ts index dd692f9566506..1ca83808cf187 100644 --- a/packages/core/src/browser/preferences/preference-provider.spec.ts +++ b/packages/core/src/browser/preferences/preference-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceProvider } from './preference-provider'; diff --git a/packages/core/src/browser/preferences/preference-provider.ts b/packages/core/src/browser/preferences/preference-provider.ts index 2dc41e8629fd1..058dfc2fd6cf3 100644 --- a/packages/core/src/browser/preferences/preference-provider.ts +++ b/packages/core/src/browser/preferences/preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/preference-proxy.spec.ts b/packages/core/src/browser/preferences/preference-proxy.spec.ts index 07c5943f678cb..7c28190f10716 100644 --- a/packages/core/src/browser/preferences/preference-proxy.spec.ts +++ b/packages/core/src/browser/preferences/preference-proxy.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/preference-proxy.ts b/packages/core/src/browser/preferences/preference-proxy.ts index cdcf92b125cbc..9f8d91e80d38a 100644 --- a/packages/core/src/browser/preferences/preference-proxy.ts +++ b/packages/core/src/browser/preferences/preference-proxy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/preference-schema-provider.spec.ts b/packages/core/src/browser/preferences/preference-schema-provider.spec.ts index d7bd77e1f9213..1df062990b9e0 100644 --- a/packages/core/src/browser/preferences/preference-schema-provider.spec.ts +++ b/packages/core/src/browser/preferences/preference-schema-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../test/jsdom'; diff --git a/packages/core/src/browser/preferences/preference-scope.ts b/packages/core/src/browser/preferences/preference-scope.ts index f7eb20accc02d..d689d036f3982 100644 --- a/packages/core/src/browser/preferences/preference-scope.ts +++ b/packages/core/src/browser/preferences/preference-scope.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceScope } from '../../common/preferences/preference-scope'; diff --git a/packages/core/src/browser/preferences/preference-service.spec.ts b/packages/core/src/browser/preferences/preference-service.spec.ts index 4d4403a95e31c..869ea0fd35aeb 100644 --- a/packages/core/src/browser/preferences/preference-service.spec.ts +++ b/packages/core/src/browser/preferences/preference-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/preference-service.ts b/packages/core/src/browser/preferences/preference-service.ts index a2f0f35f9e9a0..5947af5d303e3 100644 --- a/packages/core/src/browser/preferences/preference-service.ts +++ b/packages/core/src/browser/preferences/preference-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/preference-validation-service.spec.ts b/packages/core/src/browser/preferences/preference-validation-service.spec.ts index 246941fdc944b..e064e6ed8127f 100644 --- a/packages/core/src/browser/preferences/preference-validation-service.spec.ts +++ b/packages/core/src/browser/preferences/preference-validation-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from 'inversify'; diff --git a/packages/core/src/browser/preferences/preference-validation-service.ts b/packages/core/src/browser/preferences/preference-validation-service.ts index 319391baad657..4726e53e60a86 100644 --- a/packages/core/src/browser/preferences/preference-validation-service.ts +++ b/packages/core/src/browser/preferences/preference-validation-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceItem } from '../../common/preferences/preference-schema'; diff --git a/packages/core/src/browser/preferences/test/index.ts b/packages/core/src/browser/preferences/test/index.ts index 081c5c8e78c19..5efb20bd82a40 100644 --- a/packages/core/src/browser/preferences/test/index.ts +++ b/packages/core/src/browser/preferences/test/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './mock-preference-service'; diff --git a/packages/core/src/browser/preferences/test/mock-preference-provider.ts b/packages/core/src/browser/preferences/test/mock-preference-provider.ts index 9bf2ac6ece4a2..7e02eafa3214e 100644 --- a/packages/core/src/browser/preferences/test/mock-preference-provider.ts +++ b/packages/core/src/browser/preferences/test/mock-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/preferences/test/mock-preference-proxy.ts b/packages/core/src/browser/preferences/test/mock-preference-proxy.ts index d8111fa45d3b1..47b9fd2eba971 100644 --- a/packages/core/src/browser/preferences/test/mock-preference-proxy.ts +++ b/packages/core/src/browser/preferences/test/mock-preference-proxy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter } from '../../../common'; diff --git a/packages/core/src/browser/preferences/test/mock-preference-service.ts b/packages/core/src/browser/preferences/test/mock-preference-service.ts index 8db48b6cdc3d9..47f9359667e2f 100644 --- a/packages/core/src/browser/preferences/test/mock-preference-service.ts +++ b/packages/core/src/browser/preferences/test/mock-preference-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/preloader.ts b/packages/core/src/browser/preloader.ts index 3b1aad955c37d..7e17315c7f93c 100644 --- a/packages/core/src/browser/preloader.ts +++ b/packages/core/src/browser/preloader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '../common/nls'; diff --git a/packages/core/src/browser/progress-bar-factory.ts b/packages/core/src/browser/progress-bar-factory.ts index bc90616372cd2..d71f9d036a57b 100644 --- a/packages/core/src/browser/progress-bar-factory.ts +++ b/packages/core/src/browser/progress-bar-factory.ts @@ -11,10 +11,10 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** - import { ProgressBar } from './progress-bar'; +import { ProgressBar } from './progress-bar'; export const ProgressBarFactory = Symbol('ProgressBarFactory'); export interface ProgressBarFactory { diff --git a/packages/core/src/browser/progress-bar.ts b/packages/core/src/browser/progress-bar.ts index b2965cfec0657..3dd22381b811d 100644 --- a/packages/core/src/browser/progress-bar.ts +++ b/packages/core/src/browser/progress-bar.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { LocationProgress, ProgressLocationService } from './progress-location-service'; diff --git a/packages/core/src/browser/progress-client.ts b/packages/core/src/browser/progress-client.ts index 7199b3e55346c..598ce577c93d1 100644 --- a/packages/core/src/browser/progress-client.ts +++ b/packages/core/src/browser/progress-client.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/progress-location-service.spec.ts b/packages/core/src/browser/progress-location-service.spec.ts index 5d0f11bf80f7d..7066e6fe174e5 100644 --- a/packages/core/src/browser/progress-location-service.spec.ts +++ b/packages/core/src/browser/progress-location-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/progress-location-service.ts b/packages/core/src/browser/progress-location-service.ts index 8c63e94dd8b82..0420693bdd16d 100644 --- a/packages/core/src/browser/progress-location-service.ts +++ b/packages/core/src/browser/progress-location-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/progress-status-bar-item.ts b/packages/core/src/browser/progress-status-bar-item.ts index d63134edb146a..6bd97e622548b 100644 --- a/packages/core/src/browser/progress-status-bar-item.ts +++ b/packages/core/src/browser/progress-status-bar-item.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/quick-input/index.ts b/packages/core/src/browser/quick-input/index.ts index 52736b8120b03..8d598749a1fbe 100644 --- a/packages/core/src/browser/quick-input/index.ts +++ b/packages/core/src/browser/quick-input/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './quick-command-frontend-contribution'; export * from './quick-command-service'; diff --git a/packages/core/src/browser/quick-input/quick-access.ts b/packages/core/src/browser/quick-input/quick-access.ts index 2a7ac7d1d10e1..0a4e4dde20bc3 100644 --- a/packages/core/src/browser/quick-input/quick-access.ts +++ b/packages/core/src/browser/quick-input/quick-access.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CancellationToken, Disposable } from '../../common'; diff --git a/packages/core/src/browser/quick-input/quick-command-frontend-contribution.ts b/packages/core/src/browser/quick-input/quick-command-frontend-contribution.ts index 36591f1340848..8316c1d6ab485 100644 --- a/packages/core/src/browser/quick-input/quick-command-frontend-contribution.ts +++ b/packages/core/src/browser/quick-input/quick-command-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from 'inversify'; import { CommandRegistry, CommandContribution, MenuContribution, MenuModelRegistry, nls } from '../../common'; diff --git a/packages/core/src/browser/quick-input/quick-command-service.ts b/packages/core/src/browser/quick-input/quick-command-service.ts index ea80c90554849..7be366a648cb7 100644 --- a/packages/core/src/browser/quick-input/quick-command-service.ts +++ b/packages/core/src/browser/quick-input/quick-command-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/quick-input/quick-help-service.ts b/packages/core/src/browser/quick-input/quick-help-service.ts index 71c3dbb24a44e..debcf3d96f223 100644 --- a/packages/core/src/browser/quick-input/quick-help-service.ts +++ b/packages/core/src/browser/quick-input/quick-help-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/quick-input/quick-input-frontend-contribution.ts b/packages/core/src/browser/quick-input/quick-input-frontend-contribution.ts index 600b150621e0e..e8ed78fbce102 100644 --- a/packages/core/src/browser/quick-input/quick-input-frontend-contribution.ts +++ b/packages/core/src/browser/quick-input/quick-input-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/quick-input/quick-input-service.spec.ts b/packages/core/src/browser/quick-input/quick-input-service.spec.ts index 20f0ca7f36adb..5c22d8b40967a 100644 --- a/packages/core/src/browser/quick-input/quick-input-service.spec.ts +++ b/packages/core/src/browser/quick-input/quick-input-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/browser/quick-input/quick-input-service.ts b/packages/core/src/browser/quick-input/quick-input-service.ts index c51f350f96b8f..1a159da3c92fb 100644 --- a/packages/core/src/browser/quick-input/quick-input-service.ts +++ b/packages/core/src/browser/quick-input/quick-input-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from '../../common/quick-pick-service'; diff --git a/packages/core/src/browser/quick-input/quick-pick-service-impl.ts b/packages/core/src/browser/quick-input/quick-pick-service-impl.ts index 6ae5d1aa71613..8b2a2f68950ee 100644 --- a/packages/core/src/browser/quick-input/quick-pick-service-impl.ts +++ b/packages/core/src/browser/quick-input/quick-pick-service-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from 'inversify'; diff --git a/packages/core/src/browser/quick-input/quick-view-service.ts b/packages/core/src/browser/quick-input/quick-view-service.ts index 57d40becd3795..092fbe1e7c42d 100644 --- a/packages/core/src/browser/quick-input/quick-view-service.ts +++ b/packages/core/src/browser/quick-input/quick-view-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/request/browser-request-module.ts b/packages/core/src/browser/request/browser-request-module.ts index 836c80c8bbb02..2780d44b785ca 100644 --- a/packages/core/src/browser/request/browser-request-module.ts +++ b/packages/core/src/browser/request/browser-request-module.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/request/browser-request-service.ts b/packages/core/src/browser/request/browser-request-service.ts index 78e9e26594d60..444239e04df99 100644 --- a/packages/core/src/browser/request/browser-request-service.ts +++ b/packages/core/src/browser/request/browser-request-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/resource-context-key.ts b/packages/core/src/browser/resource-context-key.ts index 45cbd5ff47ad4..37e2660bb3a51 100644 --- a/packages/core/src/browser/resource-context-key.ts +++ b/packages/core/src/browser/resource-context-key.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/save-resource-service.ts b/packages/core/src/browser/save-resource-service.ts index cbf6871208bfd..6eb5bd876e43d 100644 --- a/packages/core/src/browser/save-resource-service.ts +++ b/packages/core/src/browser/save-resource-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/saveable.ts b/packages/core/src/browser/saveable.ts index 66b4365c38c27..02f8c07af11be 100644 --- a/packages/core/src/browser/saveable.ts +++ b/packages/core/src/browser/saveable.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget } from '@phosphor/widgets'; diff --git a/packages/core/src/browser/secondary-window-handler.ts b/packages/core/src/browser/secondary-window-handler.ts index 80902bacd809b..d5aaef2c30a17 100644 --- a/packages/core/src/browser/secondary-window-handler.ts +++ b/packages/core/src/browser/secondary-window-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('lodash.debounce'); diff --git a/packages/core/src/browser/shell/application-shell-mouse-tracker.ts b/packages/core/src/browser/shell/application-shell-mouse-tracker.ts index dd16fdd45d4a6..8a65dd5bc41a6 100644 --- a/packages/core/src/browser/shell/application-shell-mouse-tracker.ts +++ b/packages/core/src/browser/shell/application-shell-mouse-tracker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationContribution } from '../frontend-application'; diff --git a/packages/core/src/browser/shell/application-shell.ts b/packages/core/src/browser/shell/application-shell.ts index 5f33b65657ad2..4901fc4065796 100644 --- a/packages/core/src/browser/shell/application-shell.ts +++ b/packages/core/src/browser/shell/application-shell.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/shell/current-widget-command-adapter.ts b/packages/core/src/browser/shell/current-widget-command-adapter.ts index 87e6bf9b92d60..c0cd399c2cc2f 100644 --- a/packages/core/src/browser/shell/current-widget-command-adapter.ts +++ b/packages/core/src/browser/shell/current-widget-command-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandHandler } from '../../common'; diff --git a/packages/core/src/browser/shell/index.ts b/packages/core/src/browser/shell/index.ts index 691fc0f60a2ed..fdee4b77c69da 100644 --- a/packages/core/src/browser/shell/index.ts +++ b/packages/core/src/browser/shell/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './application-shell'; diff --git a/packages/core/src/browser/shell/shell-layout-restorer.ts b/packages/core/src/browser/shell/shell-layout-restorer.ts index 8b7d42df347d5..3cefbb35c74f7 100644 --- a/packages/core/src/browser/shell/shell-layout-restorer.ts +++ b/packages/core/src/browser/shell/shell-layout-restorer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/browser/shell/side-panel-handler.ts b/packages/core/src/browser/shell/side-panel-handler.ts index 22e42043d6b6e..e83644c82a431 100644 --- a/packages/core/src/browser/shell/side-panel-handler.ts +++ b/packages/core/src/browser/shell/side-panel-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/shell/side-panel-toolbar.ts b/packages/core/src/browser/shell/side-panel-toolbar.ts index bde900d714ae3..089f3ca693dee 100644 --- a/packages/core/src/browser/shell/side-panel-toolbar.ts +++ b/packages/core/src/browser/shell/side-panel-toolbar.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget, Title } from '@phosphor/widgets'; diff --git a/packages/core/src/browser/shell/sidebar-bottom-menu-widget.tsx b/packages/core/src/browser/shell/sidebar-bottom-menu-widget.tsx index 351836401bc62..d7bcc9a09eae8 100644 --- a/packages/core/src/browser/shell/sidebar-bottom-menu-widget.tsx +++ b/packages/core/src/browser/shell/sidebar-bottom-menu-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SidebarMenuWidget } from './sidebar-menu-widget'; diff --git a/packages/core/src/browser/shell/sidebar-menu-widget.tsx b/packages/core/src/browser/shell/sidebar-menu-widget.tsx index 16776beba4268..8e75b50fff5d4 100644 --- a/packages/core/src/browser/shell/sidebar-menu-widget.tsx +++ b/packages/core/src/browser/shell/sidebar-menu-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/shell/sidebar-top-menu-widget.tsx b/packages/core/src/browser/shell/sidebar-top-menu-widget.tsx index 00a3597acc646..983e74a38d7b9 100644 --- a/packages/core/src/browser/shell/sidebar-top-menu-widget.tsx +++ b/packages/core/src/browser/shell/sidebar-top-menu-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SidebarMenuWidget } from './sidebar-menu-widget'; diff --git a/packages/core/src/browser/shell/split-panels.ts b/packages/core/src/browser/shell/split-panels.ts index 6ce9b3b6f41c6..cb3de57c26dd7 100644 --- a/packages/core/src/browser/shell/split-panels.ts +++ b/packages/core/src/browser/shell/split-panels.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/shell/tab-bar-decorator.ts b/packages/core/src/browser/shell/tab-bar-decorator.ts index f38bd4e73cc64..2959337452db1 100644 --- a/packages/core/src/browser/shell/tab-bar-decorator.ts +++ b/packages/core/src/browser/shell/tab-bar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('lodash.debounce'); diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/index.ts b/packages/core/src/browser/shell/tab-bar-toolbar/index.ts index d0969ba049c78..124c45716ad3e 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/index.ts +++ b/packages/core/src/browser/shell/tab-bar-toolbar/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './tab-bar-toolbar'; diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts index cf62e95b264c4..1af64ee75bc75 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts +++ b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MenuNode, MenuPath } from '../../../common'; diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts index 0b1322d9f0266..8ea697a7a3ee5 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts +++ b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('lodash.debounce'); diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts index ec173e18b976f..0950dd0169520 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts +++ b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.ts b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.ts index 76df1486afda1..7c4c0631d645a 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.ts +++ b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../../test/jsdom'; diff --git a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx index b871f4a795847..e5d2c5e3b9f1b 100644 --- a/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx +++ b/packages/core/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/shell/tab-bars.spec.ts b/packages/core/src/browser/shell/tab-bars.spec.ts index 360c2044b0c69..91e5de7eca81f 100644 --- a/packages/core/src/browser/shell/tab-bars.spec.ts +++ b/packages/core/src/browser/shell/tab-bars.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '../test/jsdom'; diff --git a/packages/core/src/browser/shell/tab-bars.ts b/packages/core/src/browser/shell/tab-bars.ts index fc75553b9ff9c..918384027076f 100644 --- a/packages/core/src/browser/shell/tab-bars.ts +++ b/packages/core/src/browser/shell/tab-bars.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import PerfectScrollbar from 'perfect-scrollbar'; diff --git a/packages/core/src/browser/shell/theia-dock-panel.ts b/packages/core/src/browser/shell/theia-dock-panel.ts index dd67f5a8a2d55..f5818217ec98f 100644 --- a/packages/core/src/browser/shell/theia-dock-panel.ts +++ b/packages/core/src/browser/shell/theia-dock-panel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { find, toArray, ArrayExt } from '@phosphor/algorithm'; diff --git a/packages/core/src/browser/shell/view-contribution.ts b/packages/core/src/browser/shell/view-contribution.ts index 387bfc5bbc789..7b5ba31579dac 100644 --- a/packages/core/src/browser/shell/view-contribution.ts +++ b/packages/core/src/browser/shell/view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, interfaces, optional } from 'inversify'; diff --git a/packages/core/src/browser/source-tree/index.ts b/packages/core/src/browser/source-tree/index.ts index 68f7206262aac..a450303580b1c 100644 --- a/packages/core/src/browser/source-tree/index.ts +++ b/packages/core/src/browser/source-tree/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './tree-source'; diff --git a/packages/core/src/browser/source-tree/source-tree-widget.tsx b/packages/core/src/browser/source-tree/source-tree-widget.tsx index 189012021ffa4..fb13ce5e969ed 100644 --- a/packages/core/src/browser/source-tree/source-tree-widget.tsx +++ b/packages/core/src/browser/source-tree/source-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/source-tree/source-tree.ts b/packages/core/src/browser/source-tree/source-tree.ts index e90ac1eb4b5e4..2920b0e94c5d6 100644 --- a/packages/core/src/browser/source-tree/source-tree.ts +++ b/packages/core/src/browser/source-tree/source-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/source-tree/tree-source.ts b/packages/core/src/browser/source-tree/tree-source.ts index f171cc061236f..98dbb4550fc28 100644 --- a/packages/core/src/browser/source-tree/tree-source.ts +++ b/packages/core/src/browser/source-tree/tree-source.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/status-bar/index.ts b/packages/core/src/browser/status-bar/index.ts index 96ff0ae447826..6278f2b310b72 100644 --- a/packages/core/src/browser/status-bar/index.ts +++ b/packages/core/src/browser/status-bar/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/browser/status-bar/status-bar-types.ts b/packages/core/src/browser/status-bar/status-bar-types.ts index c6acb49f8e373..5f4e058a53a68 100644 --- a/packages/core/src/browser/status-bar/status-bar-types.ts +++ b/packages/core/src/browser/status-bar/status-bar-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MarkdownString } from '../../common/markdown-rendering/markdown-string'; diff --git a/packages/core/src/browser/status-bar/status-bar-view-model.ts b/packages/core/src/browser/status-bar/status-bar-view-model.ts index e837317881478..4ae64d881070b 100644 --- a/packages/core/src/browser/status-bar/status-bar-view-model.ts +++ b/packages/core/src/browser/status-bar/status-bar-view-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/status-bar/status-bar.tsx b/packages/core/src/browser/status-bar/status-bar.tsx index 1a4e7306957df..7325ad86c22f7 100644 --- a/packages/core/src/browser/status-bar/status-bar.tsx +++ b/packages/core/src/browser/status-bar/status-bar.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/storage-service.spec.ts b/packages/core/src/browser/storage-service.spec.ts index 824fbe36e2191..898b3bd543655 100644 --- a/packages/core/src/browser/storage-service.spec.ts +++ b/packages/core/src/browser/storage-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from 'inversify'; diff --git a/packages/core/src/browser/storage-service.ts b/packages/core/src/browser/storage-service.ts index 759e5c0107d8a..b0d844c410cbd 100644 --- a/packages/core/src/browser/storage-service.ts +++ b/packages/core/src/browser/storage-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/style/about.css b/packages/core/src/browser/style/about.css index bb359a1aa9701..4fccd5d4a9efd 100644 --- a/packages/core/src/browser/style/about.css +++ b/packages/core/src/browser/style/about.css @@ -11,26 +11,26 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-aboutDialog .about-details { - padding-left: 10px; + padding-left: 10px; } .theia-aboutDialog .about-details a { - cursor: pointer; + cursor: pointer; } ul.theia-aboutDialog { - flex: 1 100%; - padding-bottom: calc(var(--theia-ui-padding) * 3); + flex: 1 100%; + padding-bottom: calc(var(--theia-ui-padding) * 3); } ul.theia-aboutExtensions { - height: 200px; - overflow: hidden; - overflow-y: scroll; - list-style-type: none; - padding: 0; + height: 200px; + overflow: hidden; + overflow-y: scroll; + list-style-type: none; + padding: 0; } diff --git a/packages/core/src/browser/style/alert-messages.css b/packages/core/src/browser/style/alert-messages.css index b2e80c1116221..1e9798fd9fd86 100644 --- a/packages/core/src/browser/style/alert-messages.css +++ b/packages/core/src/browser/style/alert-messages.css @@ -11,46 +11,49 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ - /* message container */ +/* message container */ .theia-alert-message-container { - flex: 1; - padding: 10px; + flex: 1; + padding: 10px; } .theia-alert-message-container i { - transform: translateY(2px); - padding-right: 3px; + transform: translateY(2px); + padding-right: 3px; } .theia-alert-message-container .theia-message-header, .theia-alert-message-container .theia-message-content { - text-overflow: ellipsis; - overflow: hidden; + text-overflow: ellipsis; + overflow: hidden; } /* information message */ .theia-info-alert { - background-color: var(--theia-inputValidation-infoBackground); - border: var(--theia-border-width) solid var(--theia-inputValidation-infoBorder); - color: var(--theia-inputValidation-infoForeground); - padding: 10px; + background-color: var(--theia-inputValidation-infoBackground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-infoBorder); + color: var(--theia-inputValidation-infoForeground); + padding: 10px; } /* warning message */ .theia-warning-alert { - background-color: var(--theia-inputValidation-warningBackground); - border: var(--theia-border-width) solid var(--theia-inputValidation-warningBorder); - color: var(--theia-inputValidation-warningForeground); - padding: 10px; + background-color: var(--theia-inputValidation-warningBackground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-warningBorder); + color: var(--theia-inputValidation-warningForeground); + padding: 10px; } /* error message */ .theia-error-alert { - background-color: var(--theia-inputValidation-errorBackground); - border: var(--theia-border-width) solid var(--theia-inputValidation-errorBorder); - color: var(--theia-inputValidation-errorForeground); - padding: 10px; + background-color: var(--theia-inputValidation-errorBackground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-errorBorder); + color: var(--theia-inputValidation-errorForeground); + padding: 10px; } diff --git a/packages/core/src/browser/style/ansi.css b/packages/core/src/browser/style/ansi.css index 657b329c78ddc..85c867d216891 100644 --- a/packages/core/src/browser/style/ansi.css +++ b/packages/core/src/browser/style/ansi.css @@ -11,78 +11,78 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* ANSI */ .ansi-black-fg, .ansi-black-bg { - color: var(--theia-terminal-ansiBlack); + color: var(--theia-terminal-ansiBlack); } .ansi-bright-black-fg, .ansi-bright-black-bg { - color: var(--theia-terminal-ansiBrightBlack); + color: var(--theia-terminal-ansiBrightBlack); } .ansi-red-fg, .ansi-red-bg { - color: var(--theia-terminal-ansiRed); + color: var(--theia-terminal-ansiRed); } .ansi-bright-red-fg, .ansi-bright-red-bg { - color: var(--theia-terminal-ansiBrightRed); + color: var(--theia-terminal-ansiBrightRed); } .ansi-green-fg, .ansi-green-bg { - color: var(--theia-terminal-ansiGreen); + color: var(--theia-terminal-ansiGreen); } .ansi-bright-green-fg, .ansi-bright-green-bg { - color: var(--theia-terminal-ansiBrightGreen); + color: var(--theia-terminal-ansiBrightGreen); } .ansi-yellow-fg, .ansi-yellow-bg { - color: var(--theia-terminal-ansiYellow); + color: var(--theia-terminal-ansiYellow); } .ansi-bright-yellow-fg, .ansi-bright-yellow-bg { - color: var(--theia-terminal-ansiBrightYellow); + color: var(--theia-terminal-ansiBrightYellow); } .ansi-blue-fg, .ansi-blue-bg { - color: var(--theia-terminal-ansiBlue); + color: var(--theia-terminal-ansiBlue); } .ansi-bright-blue-fg, .ansi-bright-blue-bg { - color: var(--theia-terminal-ansiBrightBlue); + color: var(--theia-terminal-ansiBrightBlue); } .ansi-magenta-fg, .ansi-magenta-bg { - color: var(--theia-terminal-ansiMagenta); + color: var(--theia-terminal-ansiMagenta); } .ansi-bright-magenta-fg, .ansi-bright-magenta-bg { - color: var(--theia-terminal-ansiBrightMagenta); + color: var(--theia-terminal-ansiBrightMagenta); } .ansi-cyan-fg, .ansi-cyan-bg { - color: var(--theia-terminal-ansiCyan); + color: var(--theia-terminal-ansiCyan); } .ansi-bright-cyan-fg, .ansi-bright-cyan-bg { - color: var(--theia-terminal-ansiBrightCyan); + color: var(--theia-terminal-ansiBrightCyan); } .ansi-white-fg, .ansi-white-bg { - color: var(--theia-terminal-ansiWhite); + color: var(--theia-terminal-ansiWhite); } .ansi-bright-white-fg, .ansi-bright-white-bg { - color: var(--theia-terminal-ansiBrightWhite); + color: var(--theia-terminal-ansiBrightWhite); } diff --git a/packages/core/src/browser/style/breadcrumbs.css b/packages/core/src/browser/style/breadcrumbs.css index 28e6c94f225c5..019446ef1f66c 100644 --- a/packages/core/src/browser/style/breadcrumbs.css +++ b/packages/core/src/browser/style/breadcrumbs.css @@ -11,120 +11,120 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-breadcrumbs-height: 22px; + --theia-breadcrumbs-height: 22px; } .theia-breadcrumbs { - height: var(--theia-breadcrumbs-height); - position: relative; - user-select: none; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-start; - align-items: center; - outline-style: none; - list-style-type: none; - overflow: hidden; - padding: 0; - margin: 0; - background-color: var(--theia-breadcrumb-background); + height: var(--theia-breadcrumbs-height); + position: relative; + user-select: none; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + align-items: center; + outline-style: none; + list-style-type: none; + overflow: hidden; + padding: 0; + margin: 0; + background-color: var(--theia-breadcrumb-background); } .theia-breadcrumbs .ps__thumb-x { - /* Same scrollbar height as in tab bar. */ - height: var(--theia-private-horizontal-tab-scrollbar-height) !important; + /* Same scrollbar height as in tab bar. */ + height: var(--theia-private-horizontal-tab-scrollbar-height) !important; } .theia-breadcrumbs .theia-breadcrumb-item { - display: flex; - align-items: center; - flex: 0 1 auto; - white-space: nowrap; - align-self: center; - height: 100%; - color: var(--theia-breadcrumb-foreground); - outline: none; - padding: 0 .3rem 0 .25rem; + display: flex; + align-items: center; + flex: 0 1 auto; + white-space: nowrap; + align-self: center; + height: 100%; + color: var(--theia-breadcrumb-foreground); + outline: none; + padding: 0 0.3rem 0 0.25rem; } .theia-breadcrumbs .theia-breadcrumb-item:hover { - color: var(--theia-breadcrumb-focusForeground); + color: var(--theia-breadcrumb-focusForeground); } .theia-breadcrumbs .theia-breadcrumb-item:not(:last-of-type)::after { - font-family: codicon; - font-size: var(--theia-ui-font-size2); - content: "\eab6"; - display: flex; - align-items: center; - width: .8em; - text-align: right; - padding-left: 4px; + font-family: codicon; + font-size: var(--theia-ui-font-size2); + content: "\eab6"; + display: flex; + align-items: center; + width: 0.8em; + text-align: right; + padding-left: 4px; } .theia-breadcrumbs .theia-breadcrumb-item::before { - width: 16px; - height: 100%; - display: flex; - align-items: center; - justify-content: center; + width: 16px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; } .theia-breadcrumbs .theia-breadcrumb-item:first-of-type::before { - content: " "; + content: " "; } .theia-breadcrumb-item-haspopup:hover { - background: var(--theia-accent-color3); - cursor: pointer; + background: var(--theia-accent-color3); + cursor: pointer; } #theia-breadcrumbs-popups-overlay { - height: 0px; + height: 0px; } .theia-breadcrumbs-popup { - position: fixed; - width: 300px; - max-height: 200px; - z-index: 10000; - padding: 0px; - background: var(--theia-breadcrumbPicker-background); - font-size: var(--theia-ui-font-size1); - color: var(--theia-ui-font-color1); - box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.2); - overflow: hidden; + position: fixed; + width: 300px; + max-height: 200px; + z-index: 10000; + padding: 0px; + background: var(--theia-breadcrumbPicker-background); + font-size: var(--theia-ui-font-size1); + color: var(--theia-ui-font-color1); + box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.2); + overflow: hidden; } .theia-breadcrumbs-popup:focus { - outline-width: 0; - outline-style: none; + outline-width: 0; + outline-style: none; } .theia-breadcrumbs-popup ul { - display: flex; - flex-direction: column; - outline-style: none; - list-style-type: none; - padding-inline-start: 0px; - margin: 0 0 0 4px; + display: flex; + flex-direction: column; + outline-style: none; + list-style-type: none; + padding-inline-start: 0px; + margin: 0 0 0 4px; } .theia-breadcrumbs-popup ul li { - display: flex; - align-items: center; - flex: 0 1 auto; - white-space: nowrap; - cursor: pointer; - outline: none; - padding: .25rem .25rem .25rem .25rem; + display: flex; + align-items: center; + flex: 0 1 auto; + white-space: nowrap; + cursor: pointer; + outline: none; + padding: 0.25rem 0.25rem 0.25rem 0.25rem; } .theia-breadcrumbs-popup ul li:hover { - background: var(--theia-accent-color3); + background: var(--theia-accent-color3); } diff --git a/packages/core/src/browser/style/dialog.css b/packages/core/src/browser/style/dialog.css index 9ccd4025fc436..204ad8c60fc44 100644 --- a/packages/core/src/browser/style/dialog.css +++ b/packages/core/src/browser/style/dialog.css @@ -11,113 +11,114 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .p-Widget.dialogOverlay { - z-index: 5000; - display: flex; - flex-direction: column; - position: fixed; - width: 100vw; - height: 100vh; - top: 0; - left: 0; - justify-content: center; - align-items: center; - background: rgba(0, 0, 0, 0.3); - font-size: var(--theia-ui-font-size1); - padding: 2px; + z-index: 5000; + display: flex; + flex-direction: column; + position: fixed; + width: 100vw; + height: 100vh; + top: 0; + left: 0; + justify-content: center; + align-items: center; + background: rgba(0, 0, 0, 0.3); + font-size: var(--theia-ui-font-size1); + padding: 2px; } .p-Widget.dialogOverlay .dialogBlock { - display: flex; - flex-direction: column; - min-width: 400px; - color: var(--theia-editorWidget-foreground); - background-color: var(--theia-editorWidget-background); - border: 1px solid var(--theia-contrastBorder); - box-shadow: 0 0px 8px var(--theia-widget-shadow); + display: flex; + flex-direction: column; + min-width: 400px; + color: var(--theia-editorWidget-foreground); + background-color: var(--theia-editorWidget-background); + border: 1px solid var(--theia-contrastBorder); + box-shadow: 0 0px 8px var(--theia-widget-shadow); } .p-Widget.dialogOverlay .dialogTitle { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: space-between; - align-items: center; - text-align: center; - font-size: var(--theia-ui-font-size1); - background-color: var(--theia-statusBar-background); - color: var(--theia-statusBar-foreground); - padding: 0 calc(var(--theia-ui-padding)*2); - min-height: 24px; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + align-items: center; + text-align: center; + font-size: var(--theia-ui-font-size1); + background-color: var(--theia-statusBar-background); + color: var(--theia-statusBar-foreground); + padding: 0 calc(var(--theia-ui-padding) * 2); + min-height: 24px; } .p-Widget.dialogOverlay .dialogTitle i.closeButton { - cursor: pointer; + cursor: pointer; } .p-Widget.dialogOverlay .dialogContent { - display: flex; - flex-direction: column; - align-items: stretch; - position: relative; - padding: calc(var(--theia-ui-padding)*2); - white-space: pre-line; - max-height: 70vh; - overflow-y: auto; + display: flex; + flex-direction: column; + align-items: stretch; + position: relative; + padding: calc(var(--theia-ui-padding) * 2); + white-space: pre-line; + max-height: 70vh; + overflow-y: auto; } .p-Widget.dialogOverlay .dialogControl { - padding: calc(var(--theia-ui-padding)*2); - display: flex; - flex-direction: row; - align-content: right; - flex-wrap: nowrap; - justify-content: flex-end; - min-height: 21px; + padding: calc(var(--theia-ui-padding) * 2); + display: flex; + flex-direction: row; + align-content: right; + flex-wrap: nowrap; + justify-content: flex-end; + min-height: 21px; } .p-Widget.dialogOverlay.hidden { - display: none; + display: none; } .p-Widget.dialogOverlay.dialogErrorMessage { - display: none; + display: none; } .p-Widget.dialogOverlay .error { - color: var(--theia-inputValidation-errorForeground); + color: var(--theia-inputValidation-errorForeground); } .p-Widget.dialogOverlay .error.main { - color: var(--theia-inputValidation-errorForeground); - border-color: var(--theia-inputValidation-errorBorder); + color: var(--theia-inputValidation-errorForeground); + border-color: var(--theia-inputValidation-errorBorder); } .p-Widget.dialogOverlay .error > .theia-button.main { - background-color: var(--theia-inputValidation-errorBackground); - color: var(--theia-inputValidation-errorForeground); + background-color: var(--theia-inputValidation-errorBackground); + color: var(--theia-inputValidation-errorForeground); } .p-Widget.dialogOverlay .error > .dialogErrorMessage { - margin-top: calc(var(--theia-ui-padding)*3); - font-size: var(--theia-ui-font-size1); - display: block; + margin-top: calc(var(--theia-ui-padding) * 3); + font-size: var(--theia-ui-font-size1); + display: block; } .theia-dialog-node { - line-height: var(--theia-content-line-height); - margin-top: calc(var(--theia-ui-padding)*1.5); - margin-left: calc(var(--theia-ui-padding)*2.5); + line-height: var(--theia-content-line-height); + margin-top: calc(var(--theia-ui-padding) * 1.5); + margin-left: calc(var(--theia-ui-padding) * 2.5); } .theia-dialog-node-content { - display: flex; - align-items: center; - margin-right: calc(var(--theia-ui-padding)*1.5);} + display: flex; + align-items: center; + margin-right: calc(var(--theia-ui-padding) * 1.5); +} .theia-dialog-node-segment { - flex-grow: 0; - user-select: none; - white-space: nowrap; + flex-grow: 0; + user-select: none; + white-space: nowrap; } .theia-dialog-icon { - align-content: center; - margin-right: calc(var(--theia-ui-padding)*1.5); + align-content: center; + margin-right: calc(var(--theia-ui-padding) * 1.5); } diff --git a/packages/core/src/browser/style/dockpanel.css b/packages/core/src/browser/style/dockpanel.css index 7a76b70c501a8..048d8bbc5c966 100644 --- a/packages/core/src/browser/style/dockpanel.css +++ b/packages/core/src/browser/style/dockpanel.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .p-DockPanel.p-SplitPanel-child { @@ -23,26 +23,26 @@ min-height: 100px; } -.p-DockPanel-handle[data-orientation='vertical'] { +.p-DockPanel-handle[data-orientation="vertical"] { min-height: var(--theia-border-width); z-index: 3; } -.p-DockPanel-handle[data-orientation='horizontal'] { +.p-DockPanel-handle[data-orientation="horizontal"] { min-width: var(--theia-border-width); } -.p-DockPanel-handle[data-orientation='horizontal']::after { +.p-DockPanel-handle[data-orientation="horizontal"]::after { min-width: var(--theia-sash-width); transform: translateX(0%); - left: calc(-1*var(--theia-sash-width)/2); + left: calc(-1 * var(--theia-sash-width) / 2); } -.p-DockPanel-handle[data-orientation='vertical']::after { +.p-DockPanel-handle[data-orientation="vertical"]::after { min-height: var(--theia-sash-width); width: 100%; transform: translateY(0%); - top: calc(-1*var(--theia-sash-width)/2); + top: calc(-1 * var(--theia-sash-width) / 2); } .p-DockPanel-handle:hover::after { @@ -72,5 +72,5 @@ } .p-DockPanel-overlay.p-mod-root-bottom { - background: var(--theia-panel-dropBackground); + background: var(--theia-panel-dropBackground); } diff --git a/packages/core/src/browser/style/hover-service.css b/packages/core/src/browser/style/hover-service.css index 86ba955b654b0..f542382d85012 100644 --- a/packages/core/src/browser/style/hover-service.css +++ b/packages/core/src/browser/style/hover-service.css @@ -11,89 +11,89 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* Adapted from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/workbench/services/hover/browser/hoverService.ts */ :root { - --theia-hover-max-width: 500px; + --theia-hover-max-width: 500px; } .theia-hover { - font-family: var(--theia-ui-font-family); - font-size: var(--theia-ui-font-size1); - color: var(--theia-editorHoverWidget-foreground); - background-color: var(--theia-editorHoverWidget-background); - border: 1px solid var(--theia-editorHoverWidget-border); - padding: var(--theia-ui-padding); - max-width: var(--theia-hover-max-width); + font-family: var(--theia-ui-font-family); + font-size: var(--theia-ui-font-size1); + color: var(--theia-editorHoverWidget-foreground); + background-color: var(--theia-editorHoverWidget-background); + border: 1px solid var(--theia-editorHoverWidget-border); + padding: var(--theia-ui-padding); + max-width: var(--theia-hover-max-width); } .theia-hover .hover-row:not(:first-child):not(:empty) { - border-top: 1px solid var(--theia-editorHoverWidgetInternalBorder); + border-top: 1px solid var(--theia-editorHoverWidgetInternalBorder); } .theia-hover hr { - border-top: 1px solid var(--theia-editorHoverWidgetInternalBorder); - border-bottom: 0px solid var(--theia-editorHoverWidgetInternalBorder); - margin: var(--theia-ui-padding) calc(var(--theia-ui-padding) * -1); + border-top: 1px solid var(--theia-editorHoverWidgetInternalBorder); + border-bottom: 0px solid var(--theia-editorHoverWidgetInternalBorder); + margin: var(--theia-ui-padding) calc(var(--theia-ui-padding) * -1); } .theia-hover a { - color: var(--theia-textLink-foreground); + color: var(--theia-textLink-foreground); } .theia-hover a:hover { - color: var(--theia-textLink-active-foreground); + color: var(--theia-textLink-active-foreground); } .theia-hover .hover-row .actions { - background-color: var(--theia-editorHoverWidget-statusBarBackground); + background-color: var(--theia-editorHoverWidget-statusBarBackground); } .theia-hover code { - background-color: var(--theia-textCodeBlock-background); - font-family: var(--theia-code-font-family); + background-color: var(--theia-textCodeBlock-background); + font-family: var(--theia-code-font-family); } .theia-hover::before { - content: ''; - position: absolute; + content: ""; + position: absolute; } .theia-hover.top::before { - left: var(--theia-hover-before-position); - bottom: -5px; - border-top: 5px solid var(--theia-editorHoverWidget-border); - border-left: 5px solid transparent; - border-right: 5px solid transparent; + left: var(--theia-hover-before-position); + bottom: -5px; + border-top: 5px solid var(--theia-editorHoverWidget-border); + border-left: 5px solid transparent; + border-right: 5px solid transparent; } .theia-hover.bottom::before { - left: var(--theia-hover-before-position); - top: -5px; - border-bottom: 5px solid var(--theia-editorHoverWidget-border); - border-left: 5px solid transparent; - border-right: 5px solid transparent; + left: var(--theia-hover-before-position); + top: -5px; + border-bottom: 5px solid var(--theia-editorHoverWidget-border); + border-left: 5px solid transparent; + border-right: 5px solid transparent; } .theia-hover.left::before { - top: var(--theia-hover-before-position); - right: -5px; - border-left: 5px solid var(--theia-editorHoverWidget-border); - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; + top: var(--theia-hover-before-position); + right: -5px; + border-left: 5px solid var(--theia-editorHoverWidget-border); + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; } .theia-hover.right::before { - top: var(--theia-hover-before-position); - left: -5px; - border-right: 5px solid var(--theia-editorHoverWidget-border); - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; + top: var(--theia-hover-before-position); + left: -5px; + border-right: 5px solid var(--theia-editorHoverWidget-border); + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; } .theia-hover.extended-tab-preview { - border-radius: 10px; + border-radius: 10px; } diff --git a/packages/core/src/browser/style/icons.css b/packages/core/src/browser/style/icons.css index 765692a50b3b8..1b215179a8c6c 100644 --- a/packages/core/src/browser/style/icons.css +++ b/packages/core/src/browser/style/icons.css @@ -11,51 +11,51 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-open-change-icon { - width: var(--theia-icon-size); - height: var(--theia-icon-size); - background: var(--theia-icon-open-change) no-repeat; + width: var(--theia-icon-size); + height: var(--theia-icon-size); + background: var(--theia-icon-open-change) no-repeat; } .theia-open-file-icon { - width: var(--theia-icon-size); - height: var(--theia-icon-size); - background: var(--theia-icon-open-file) no-repeat; + width: var(--theia-icon-size); + height: var(--theia-icon-size); + background: var(--theia-icon-open-file) no-repeat; } .theia-open-preview-icon { - width: var(--theia-icon-size); - height: var(--theia-icon-size); - background: var(--theia-icon-preview) no-repeat; + width: var(--theia-icon-size); + height: var(--theia-icon-size); + background: var(--theia-icon-preview) no-repeat; } .theia-open-json-icon { - width: var(--theia-icon-size); - height: var(--theia-icon-size); - background: var(--theia-icon-open-json) no-repeat; + width: var(--theia-icon-size); + height: var(--theia-icon-size); + background: var(--theia-icon-open-json) no-repeat; } .theia-collapse-all-icon { - background: var(--theia-icon-collapse-all) center center no-repeat; + background: var(--theia-icon-collapse-all) center center no-repeat; } .theia-remove-all-icon { - background: var(--theia-icon-remove-all) center center no-repeat; + background: var(--theia-icon-remove-all) center center no-repeat; } .theia-add-icon { - background: var(--theia-icon-add) center center no-repeat; + background: var(--theia-icon-add) center center no-repeat; } @keyframes theia-spin { - 100% { - transform:rotate(360deg); - } + 100% { + transform: rotate(360deg); + } } .theia-animation-spin { - animation: theia-spin 1.5s linear infinite; + animation: theia-spin 1.5s linear infinite; } diff --git a/packages/core/src/browser/style/index.css b/packages/core/src/browser/style/index.css index dcd45cea71c50..f437aaf8d8e90 100644 --- a/packages/core/src/browser/style/index.css +++ b/packages/core/src/browser/style/index.css @@ -11,24 +11,22 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import url('~@phosphor/widgets/style/index.css'); -@import url('~font-awesome/css/font-awesome.min.css'); +@import url("~@phosphor/widgets/style/index.css"); +@import url("~font-awesome/css/font-awesome.min.css"); /*----------------------------------------------------------------------------- | General |----------------------------------------------------------------------------*/ :root { - /* Borders: Width and color (dark to bright) */ --theia-border-width: 1px; --theia-panel-border-width: 1px; - /* UI fonts: Family, size and color (bright to dark) --------------------------------------------------- The UI font CSS variables are used for the typography all of the Theia @@ -36,10 +34,16 @@ */ --theia-ui-font-scale-factor: 1.2; - --theia-ui-font-size0: calc(var(--theia-ui-font-size1) / var(--theia-ui-font-scale-factor)); + --theia-ui-font-size0: calc( + var(--theia-ui-font-size1) / var(--theia-ui-font-scale-factor) + ); --theia-ui-font-size1: 13px; /* Base font size */ - --theia-ui-font-size2: calc(var(--theia-ui-font-size1) * var(--theia-ui-font-scale-factor)); - --theia-ui-font-size3: calc(var(--theia-ui-font-size2) * var(--theia-ui-font-scale-factor)); + --theia-ui-font-size2: calc( + var(--theia-ui-font-size1) * var(--theia-ui-font-scale-factor) + ); + --theia-ui-font-size3: calc( + var(--theia-ui-font-size2) * var(--theia-ui-font-scale-factor) + ); --theia-ui-icon-font-size: 14px; /* Ensures px perfect FontAwesome icons */ --theia-ui-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -53,7 +57,8 @@ --theia-code-font-size: 13px; --theia-code-line-height: 17px; --theia-code-padding: 5px; - --theia-code-font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback"; + --theia-code-font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", + "Courier New", monospace, "Droid Sans Fallback"; --theia-monospace-font-family: monospace; --theia-ui-padding: 6px; @@ -86,48 +91,49 @@ body:-moz-window-inactive { } a { - color: var(--theia-textLink-foreground); + color: var(--theia-textLink-foreground); } -a:active, a:hover { - color: var(--theia-textLink-activeForeground); +a:active, +a:hover { + color: var(--theia-textLink-activeForeground); } code { - color: var(--theia-textPreformat-foreground); + color: var(--theia-textPreformat-foreground); } blockquote { - margin: 0 7px 0 5px; - padding: 0px 16px 0px 10px; - background: var(--theia-textBlockQuote-background); - border-left: 5px solid var(--theia-textBlockQuote-border); + margin: 0 7px 0 5px; + padding: 0px 16px 0px 10px; + background: var(--theia-textBlockQuote-background); + border-left: 5px solid var(--theia-textBlockQuote-border); } .theia-input { - background: var(--theia-input-background); - color: var(--theia-input-foreground); - border: var(--theia-border-width) solid var(--theia-input-border); - font-family: var(--theia-ui-font-family); - font-size: var(--theia-ui-font-size1); - line-height: var(--theia-content-line-height); - padding-left: 5px; + background: var(--theia-input-background); + color: var(--theia-input-foreground); + border: var(--theia-border-width) solid var(--theia-input-border); + font-family: var(--theia-ui-font-family); + font-size: var(--theia-ui-font-size1); + line-height: var(--theia-content-line-height); + padding-left: 5px; } .theia-input::placeholder { - color: var(--theia-input-placeholderForeground); + color: var(--theia-input-placeholderForeground); } .theia-maximized { - position: fixed !important; - top: 0 !important; - bottom: 0 !important; - left: 0 !important; - right: 0 !important; - width: auto !important; - height: auto !important; - z-index: 255 !important; - background: var(--theia-editor-background); + position: fixed !important; + top: 0 !important; + bottom: 0 !important; + left: 0 !important; + right: 0 !important; + width: auto !important; + height: auto !important; + z-index: 255 !important; + background: var(--theia-editor-background); } .theia-visible-menu-maximized { @@ -188,7 +194,8 @@ blockquote { margin-left: 8px; } -.theia-mod-disabled, .theia-mod-disabled:focus { +.theia-mod-disabled, +.theia-mod-disabled:focus { opacity: var(--theia-mod-disabled-opacity) !important; } @@ -209,21 +216,21 @@ blockquote { .noselect, .no-select { -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Safari */ - -khtml-user-select: none; /* Konqueror HTML */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - user-select: none; /* Non-prefixed version, currently + -webkit-user-select: none; /* Safari */ + -khtml-user-select: none; /* Konqueror HTML */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; /* Non-prefixed version, currently supported by Chrome and Opera */ - -o-user-select: none; + -o-user-select: none; } :focus { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1; - outline-color: var(--theia-focusBorder); + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + opacity: 1; + outline-color: var(--theia-focusBorder); } ::selection { @@ -247,7 +254,7 @@ blockquote { outline: none; cursor: pointer; padding: 4px 9px; - margin-left: calc(var(--theia-ui-padding)*2); + margin-left: calc(var(--theia-ui-padding) * 2); } .theia-button:focus { @@ -266,36 +273,38 @@ blockquote { cursor: default; } -button.secondary[disabled], .theia-button.secondary[disabled] { - color: var(--theia-secondaryButton-disabledForeground); - background-color: var(--theia-secondaryButton-disabledBackground); +button.secondary[disabled], +.theia-button.secondary[disabled] { + color: var(--theia-secondaryButton-disabledForeground); + background-color: var(--theia-secondaryButton-disabledBackground); } .theia-select { - color: var(--dropdown-foreground); - font-size: var(--theia-ui-font-size1); - border-radius: 0; - border: 1px solid var(--theia-dropdown-border); - background: var(--theia-dropdown-background); - outline: none; - cursor: pointer; + color: var(--dropdown-foreground); + font-size: var(--theia-ui-font-size1); + border-radius: 0; + border: 1px solid var(--theia-dropdown-border); + background: var(--theia-dropdown-background); + outline: none; + cursor: pointer; } .theia-select option { - background: var(--theia-dropdown-listBackground); + background: var(--theia-dropdown-listBackground); } .theia-transparent-overlay { - background-color: transparent; - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - z-index: 999; + background-color: transparent; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + z-index: 999; } -.theia-cursor-no-drop, .theia-cursor-no-drop:active { +.theia-cursor-no-drop, +.theia-cursor-no-drop:active { cursor: no-drop; } @@ -303,24 +312,24 @@ button.secondary[disabled], .theia-button.secondary[disabled] { | Import children style files |----------------------------------------------------------------------------*/ -@import './dockpanel.css'; -@import './dialog.css'; -@import './menus.css'; -@import './sidepanel.css'; -@import './tabs.css'; -@import './scrollbars.css'; -@import './tree.css'; -@import './status-bar.css'; -@import './tree-decorators.css'; -@import './about.css'; -@import './search-box.css'; -@import './ansi.css'; -@import './view-container.css'; -@import './notification.css'; -@import './alert-messages.css'; -@import './icons.css'; -@import './widget.css'; -@import './quick-title-bar.css'; -@import './progress-bar.css'; -@import './breadcrumbs.css'; -@import './tooltip.css'; +@import "./dockpanel.css"; +@import "./dialog.css"; +@import "./menus.css"; +@import "./sidepanel.css"; +@import "./tabs.css"; +@import "./scrollbars.css"; +@import "./tree.css"; +@import "./status-bar.css"; +@import "./tree-decorators.css"; +@import "./about.css"; +@import "./search-box.css"; +@import "./ansi.css"; +@import "./view-container.css"; +@import "./notification.css"; +@import "./alert-messages.css"; +@import "./icons.css"; +@import "./widget.css"; +@import "./quick-title-bar.css"; +@import "./progress-bar.css"; +@import "./breadcrumbs.css"; +@import "./tooltip.css"; diff --git a/packages/core/src/browser/style/menus.css b/packages/core/src/browser/style/menus.css index d1d45d3a36fce..f6bf9c4f2b696 100644 --- a/packages/core/src/browser/style/menus.css +++ b/packages/core/src/browser/style/menus.css @@ -11,37 +11,32 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /*----------------------------------------------------------------------------- | Variables |----------------------------------------------------------------------------*/ - :root { --theia-private-menubar-height: 32px; --theia-private-menu-item-height: 24px; --theia-menu-z-index: 10000; } - /*----------------------------------------------------------------------------- | MenuBar |----------------------------------------------------------------------------*/ - .p-Widget.p-MenuBar { padding-left: 5px; font-size: var(--theia-ui-font-size1); } - .p-MenuBar-menu { - transform: translateY(calc(-2*var(--theia-border-width))); + transform: translateY(calc(-2 * var(--theia-border-width))); } - .p-MenuBar-item { padding: 0px 8px; line-height: var(--theia-private-menubar-height); @@ -51,40 +46,37 @@ white-space: pre; } - .p-MenuBar-item.p-mod-active { background: var(--theia-menubar-selectionBackground); color: var(--theia-menubar-selectionForeground); opacity: 1; } - .p-MenuBar.p-mod-active .p-MenuBar-item.p-mod-active { z-index: calc(var(--theia-menu-z-index) - 1); background: var(--theia-menubar-selectionBackground); - border-left: var(--theia-border-width) solid var(--theia-menubar-selectionBorder); - border-right: var(--theia-border-width) solid var(--theia-menubar-selectionBorder); + border-left: var(--theia-border-width) solid + var(--theia-menubar-selectionBorder); + border-right: var(--theia-border-width) solid + var(--theia-menubar-selectionBorder); } - .p-MenuBar-item.p-mod-disabled { opacity: var(--theia-mod-disabled-opacity); } - .p-MenuBar-item.p-type-separator { margin: 2px; padding: 0; border: none; - border-left: var(--theia-border-width) solid var(--theia-menu-separatorBackground); + border-left: var(--theia-border-width) solid + var(--theia-menu-separatorBackground); } - .p-MenuBar-itemMnemonic { text-decoration: underline; } - #theia-top-panel { background: var(--theia-titleBar-activeBackground); color: var(--theia-titleBar-activeForeground); @@ -102,7 +94,6 @@ | Menu |----------------------------------------------------------------------------*/ - .p-Menu { z-index: var(--theia-menu-z-index); padding: 4px 0px; @@ -124,7 +115,6 @@ line-height: var(--theia-private-menu-item-height); } - .p-Menu-item.p-mod-active { background: var(--theia-menu-selectionBackground); color: var(--theia-menu-selectionForeground); @@ -133,60 +123,53 @@ cursor: pointer; } - .p-Menu-item.p-mod-disabled { opacity: var(--theia-mod-disabled-opacity); } - .p-Menu-itemIcon { width: 21px; padding: 0px 2px 0px 4px; margin-top: -2px; } - .p-Menu-itemLabel { padding: 0px 32px 0px 2px; } - .p-Menu-itemMnemonic { text-decoration: underline; } - .p-Menu-itemShortcut { padding: 0px; } - .p-Menu-itemSubmenuIcon { width: var(--theia-icon-size); padding: 0px 10px 0px 0px; } - -.p-Menu-item[data-type='separator'] > div { +.p-Menu-item[data-type="separator"] > div { padding: 0; height: 9px; opacity: 0.36; } - -.p-Menu-item[data-type='separator'] > div::after { - content: ''; +.p-Menu-item[data-type="separator"] > div::after { + content: ""; display: block; position: relative; top: 4px; - border-top: var(--theia-border-width) solid var(--theia-menu-separatorBackground); + border-top: var(--theia-border-width) solid + var(--theia-menu-separatorBackground); } -.p-Menu-item[data-type='separator'] > div.p-Menu-itemIcon::after { +.p-Menu-item[data-type="separator"] > div.p-Menu-itemIcon::after { margin-left: 12px; } -.p-Menu-item[data-type='separator'] > div.p-Menu-itemSubmenuIcon::after { +.p-Menu-item[data-type="separator"] > div.p-Menu-itemSubmenuIcon::after { margin-right: 12px; } @@ -205,13 +188,11 @@ transform: translateY(20%); } - .p-Menu-item.p-mod-toggled > .p-Menu-itemIcon::before { - content: '\eab2'; + content: "\eab2"; transform: scale(0.8) translateY(20%); } - -.p-Menu-item[data-type='submenu'] > .p-Menu-itemSubmenuIcon::before { - content: '\eab6'; +.p-Menu-item[data-type="submenu"] > .p-Menu-itemSubmenuIcon::before { + content: "\eab6"; } diff --git a/packages/core/src/browser/style/notification.css b/packages/core/src/browser/style/notification.css index 66f7410cee145..3153b222ed37d 100644 --- a/packages/core/src/browser/style/notification.css +++ b/packages/core/src/browser/style/notification.css @@ -11,29 +11,29 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-notification-count-height: 15.5px; - --theia-notification-count-width: 15.5px; + --theia-notification-count-height: 15.5px; + --theia-notification-count-width: 15.5px; } .notification-count-container { - align-self: center; - background-color: var(--theia-badge-background); - border-radius: 20px; - color: var(--theia-badge-foreground); - display: flex; - font-size: calc(var(--theia-ui-font-size0) * 0.8); - font-weight: 500; - height: var(--theia-notification-count-height); - justify-content: center; - min-width: 6px; - padding: 0 5px; - text-align: center; + align-self: center; + background-color: var(--theia-badge-background); + border-radius: 20px; + color: var(--theia-badge-foreground); + display: flex; + font-size: calc(var(--theia-ui-font-size0) * 0.8); + font-weight: 500; + height: var(--theia-notification-count-height); + justify-content: center; + min-width: 6px; + padding: 0 5px; + text-align: center; } .notification-count-container > .notification-count { - align-self: center; + align-self: center; } diff --git a/packages/core/src/browser/style/progress-bar.css b/packages/core/src/browser/style/progress-bar.css index 03b9e9a942a66..42cf878c9fb93 100644 --- a/packages/core/src/browser/style/progress-bar.css +++ b/packages/core/src/browser/style/progress-bar.css @@ -11,32 +11,33 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-progress-bar-container { - width: 100%; - height: 2px; + width: 100%; + height: 2px; } .theia-progress-bar { - background-color: var(--theia-progressBar-background); - height: 2px; - width: 3%; - animation: progress-animation 1.3s 0s infinite cubic-bezier(0.645, 0.045, 0.355, 1); + background-color: var(--theia-progressBar-background); + height: 2px; + width: 3%; + animation: progress-animation 1.3s 0s infinite + cubic-bezier(0.645, 0.045, 0.355, 1); } @keyframes progress-animation { - 0% { - margin-left: 0%; - width: 3%; - } - 60% { - margin-left: 45%; - width: 20%; - } - 100% { - margin-left: 99%; - width: 1%; - } + 0% { + margin-left: 0%; + width: 3%; + } + 60% { + margin-left: 45%; + width: 20%; + } + 100% { + margin-left: 99%; + width: 1%; + } } diff --git a/packages/core/src/browser/style/quick-title-bar.css b/packages/core/src/browser/style/quick-title-bar.css index 7a32fd2c1c332..3969cd3607378 100644 --- a/packages/core/src/browser/style/quick-title-bar.css +++ b/packages/core/src/browser/style/quick-title-bar.css @@ -11,35 +11,35 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-quick-title-container { - display: flex; - padding: calc(var(--theia-ui-padding)/2); - justify-content: space-between; - align-items: center; - background: var(--theia-titleBar-activeBackground); + display: flex; + padding: calc(var(--theia-ui-padding) / 2); + justify-content: space-between; + align-items: center; + background: var(--theia-titleBar-activeBackground); } .theia-quick-title-left-bar { - display: flex; - text-align: left; + display: flex; + text-align: left; } .theia-quick-title-right-bar { - display: flex; - text-align: right; + display: flex; + text-align: right; } .theia-quick-title-header { - text-align: center; + text-align: center; } .theia-quick-title-button { - width: var(--theia-icon-size); - height: var(--theia-icon-size); - display: flex; - align-items: center; - cursor: pointer; + width: var(--theia-icon-size); + height: var(--theia-icon-size); + display: flex; + align-items: center; + cursor: pointer; } diff --git a/packages/core/src/browser/style/scrollbars.css b/packages/core/src/browser/style/scrollbars.css index 94c79dbef8703..17e96058a76d6 100644 --- a/packages/core/src/browser/style/scrollbars.css +++ b/packages/core/src/browser/style/scrollbars.css @@ -11,38 +11,37 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import url('~perfect-scrollbar/css/perfect-scrollbar.css'); +@import url("~perfect-scrollbar/css/perfect-scrollbar.css"); ::-webkit-scrollbar { - height: var(--theia-scrollbar-width); - width: var(--theia-scrollbar-width); - background: transparent; + height: var(--theia-scrollbar-width); + width: var(--theia-scrollbar-width); + background: transparent; } ::-webkit-scrollbar-thumb { - background: var(--theia-scrollbarSlider-background); + background: var(--theia-scrollbarSlider-background); } ::-webkit-scrollbar:hover { - background: transparent; + background: transparent; } ::-webkit-scrollbar-thumb:hover { - background: var(--theia-scrollbarSlider-hoverBackground); + background: var(--theia-scrollbarSlider-hoverBackground); } ::-webkit-scrollbar-thumb:active { - background: var(--theia-scrollbarSlider-activeBackground); + background: var(--theia-scrollbarSlider-activeBackground); } ::-webkit-scrollbar-corner { - background: transparent; + background: transparent; } - /*----------------------------------------------------------------------------- | Perfect scrollbar |----------------------------------------------------------------------------*/ @@ -50,16 +49,18 @@ #theia-app-shell .ps__rail-x, #theia-dialog-shell .ps__rail-x, #theia-breadcrumbs-popups-overlay .ps__rail-x { - height: var(--theia-scrollbar-rail-width); + height: var(--theia-scrollbar-rail-width); } #theia-app-shell .ps__rail-x > .ps__thumb-x, #theia-dialog-shell .ps__rail-x > .ps__thumb-x, #theia-breadcrumbs-popups-overlay .ps__thumb-x { - height: var(--theia-scrollbar-width); - bottom: calc((var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2); - background: var(--theia-scrollbarSlider-background); - border-radius: 0px; + height: var(--theia-scrollbar-width); + bottom: calc( + (var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2 + ); + background: var(--theia-scrollbarSlider-background); + border-radius: 0px; } #theia-app-shell .ps__rail-x:hover, @@ -68,7 +69,7 @@ #theia-dialog-shell .ps__rail-x:focus, #theia-breadcrumbs-popups-overlay .ps__rail-x:hover, #theia-breadcrumbs-popups-overlay .ps__rail-x:focus { - height: var(--theia-scrollbar-rail-width); + height: var(--theia-scrollbar-rail-width); } #theia-app-shell .ps__rail-x:hover > .ps__thumb-x, @@ -79,23 +80,25 @@ #theia-dialog-shell .ps__rail-x.ps--clicking .ps__thumb-x, #theia-breadcrumbs-popups-overlay .ps__rail-x:hover > .ps__thumb-x, #theia-breadcrumbs-popups-overlay .ps__rail-x:focus > .ps__thumb-x, -#theia-breadcrumbs-popups-overlay .ps__rail-x.ps--clicking .ps__thumb-x { - height: var(--theia-scrollbar-width); +#theia-breadcrumbs-popups-overlay .ps__rail-x.ps--clicking .ps__thumb-x { + height: var(--theia-scrollbar-width); } #theia-app-shell .ps__rail-y, #theia-dialog-shell .ps__rail-y, #theia-breadcrumbs-popups-overlay .ps__rail-y { - width: var(--theia-scrollbar-rail-width); + width: var(--theia-scrollbar-rail-width); } #theia-app-shell .ps__rail-y > .ps__thumb-y, #theia-dialog-shell .ps__rail-y > .ps__thumb-y, #theia-breadcrumbs-popups-overlay .ps__rail-y > .ps__thumb-y { - width: var(--theia-scrollbar-width); - right: calc((var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2); - background: var(--theia-scrollbarSlider-background); - border-radius: 0px; + width: var(--theia-scrollbar-width); + right: calc( + (var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2 + ); + background: var(--theia-scrollbarSlider-background); + border-radius: 0px; } #theia-app-shell .ps__rail-y:hover, @@ -104,7 +107,7 @@ #theia-dialog-shell .ps__rail-y:focus, #theia-breadcrumbs-popups-overlay .ps__rail-y:hover, #theia-breadcrumbs-popups-overlay .ps__rail-y:focus { - width: var(--theia-scrollbar-rail-width); + width: var(--theia-scrollbar-rail-width); } #theia-app-shell .ps__rail-y:hover > .ps__thumb-y, @@ -115,41 +118,55 @@ #theia-dialog-shell .ps__rail-y.ps--clicking .ps__thumb-y, #theia-breadcrumbs-popups-overlay .ps__rail-y:hover > .ps__thumb-y, #theia-breadcrumbs-popups-overlay .ps__rail-y:focus > .ps__thumb-y, -#theia-breadcrumbs-popups-overlay .ps__rail-y.ps--clicking .ps__thumb-y { - right: calc((var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2); - width: var(--theia-scrollbar-width); -} - -#theia-app-shell .ps [class^='ps__rail'].ps--clicking > [class^='ps__thumb'], -#theia-dialog-shell .ps [class^='ps__rail'].ps--clicking > [class^='ps__thumb'], -#theia-breadcrumbs-popups-overlay .ps [class^='ps__rail'].ps--clicking > [class^='ps__thumb'] { - background-color: var(--theia-scrollbarSlider-activeBackground); -} - -#theia-app-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:hover, -#theia-app-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:focus, -#theia-dialog-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:hover, -#theia-dialog-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:focus, -#theia-breadcrumbs-popups-overlay .ps [class^='ps__rail'] > [class^='ps__thumb']:hover, -#theia-breadcrumbs-popups-overlay .ps [class^='ps__rail'] > [class^='ps__thumb']:focus { - background: var(--theia-scrollbarSlider-hoverBackground); -} - -#theia-app-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:active, -#theia-dialog-shell .ps [class^='ps__rail'] > [class^='ps__thumb']:active, -#theia-breadcrumbs-popups-overlay .ps [class^='ps__rail'] > [class^='ps__thumb']:active { - background: var(--theia-scrollbarSlider-activeBackground); -} - -#theia-app-shell .ps:hover > [class^='ps__rail'], -#theia-app-shell .ps--focus > [class^='ps__rail'], -#theia-app-shell .ps--scrolling-y > [class^='ps__rail'], -#theia-dialog-shell .ps:hover > [class^='ps__rail'], -#theia-dialog-shell .ps--focus > [class^='ps__rail'], -#theia-dialog-shell .ps--scrolling-y > [class^='ps__rail'], -#theia-breadcrumbs-popups-overlay .ps:hover > [class^='ps__rail'], -#theia-breadcrumbs-popups-overlay .ps--focus > [class^='ps__rail'], -#theia-breadcrumbs-popups-overlay .ps--scrolling-y > [class^='ps__rail'] { - opacity: 1; - background: transparent; +#theia-breadcrumbs-popups-overlay .ps__rail-y.ps--clicking .ps__thumb-y { + right: calc( + (var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2 + ); + width: var(--theia-scrollbar-width); +} + +#theia-app-shell .ps [class^="ps__rail"].ps--clicking > [class^="ps__thumb"], +#theia-dialog-shell .ps [class^="ps__rail"].ps--clicking > [class^="ps__thumb"], +#theia-breadcrumbs-popups-overlay + .ps + [class^="ps__rail"].ps--clicking + > [class^="ps__thumb"] { + background-color: var(--theia-scrollbarSlider-activeBackground); +} + +#theia-app-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:hover, +#theia-app-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:focus, +#theia-dialog-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:hover, +#theia-dialog-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:focus, +#theia-breadcrumbs-popups-overlay + .ps + [class^="ps__rail"] + > [class^="ps__thumb"]:hover, +#theia-breadcrumbs-popups-overlay + .ps + [class^="ps__rail"] + > [class^="ps__thumb"]:focus { + background: var(--theia-scrollbarSlider-hoverBackground); +} + +#theia-app-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:active, +#theia-dialog-shell .ps [class^="ps__rail"] > [class^="ps__thumb"]:active, +#theia-breadcrumbs-popups-overlay + .ps + [class^="ps__rail"] + > [class^="ps__thumb"]:active { + background: var(--theia-scrollbarSlider-activeBackground); +} + +#theia-app-shell .ps:hover > [class^="ps__rail"], +#theia-app-shell .ps--focus > [class^="ps__rail"], +#theia-app-shell .ps--scrolling-y > [class^="ps__rail"], +#theia-dialog-shell .ps:hover > [class^="ps__rail"], +#theia-dialog-shell .ps--focus > [class^="ps__rail"], +#theia-dialog-shell .ps--scrolling-y > [class^="ps__rail"], +#theia-breadcrumbs-popups-overlay .ps:hover > [class^="ps__rail"], +#theia-breadcrumbs-popups-overlay .ps--focus > [class^="ps__rail"], +#theia-breadcrumbs-popups-overlay .ps--scrolling-y > [class^="ps__rail"] { + opacity: 1; + background: transparent; } diff --git a/packages/core/src/browser/style/search-box.css b/packages/core/src/browser/style/search-box.css index 045ab835b752f..fcddd088672c2 100644 --- a/packages/core/src/browser/style/search-box.css +++ b/packages/core/src/browser/style/search-box.css @@ -11,111 +11,113 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-search-box-padding: 3px; - --theia-search-box-radius: 2px; - --theia-search-box-spacing: 4px; - --theia-search-box-max-width: 500px; + --theia-search-box-padding: 3px; + --theia-search-box-radius: 2px; + --theia-search-box-spacing: 4px; + --theia-search-box-max-width: 500px; } .theia-search-box { - position: absolute; - display: flex; - top: var(--theia-search-box-spacing); - right: var(--theia-search-box-spacing); - box-shadow: var(--theia-border-width) var(--theia-border-width) var(--theia-widget-shadow); - background-color: var(--theia-listFilterWidget-background); - z-index: calc(var(--theia-tabbar-toolbar-z-index) + 1); - border-radius: var(--theia-search-box-radius); - padding: var(--theia-search-box-padding); - border: var(--theia-border-width) solid rgba(0, 0, 0, 0) + position: absolute; + display: flex; + top: var(--theia-search-box-spacing); + right: var(--theia-search-box-spacing); + box-shadow: var(--theia-border-width) var(--theia-border-width) + var(--theia-widget-shadow); + background-color: var(--theia-listFilterWidget-background); + z-index: calc(var(--theia-tabbar-toolbar-z-index) + 1); + border-radius: var(--theia-search-box-radius); + padding: var(--theia-search-box-padding); + border: var(--theia-border-width) solid rgba(0, 0, 0, 0); } .theia-search-box.no-match { - border: var(--theia-border-width) solid var(--theia-inputValidation-errorBorder) + border: var(--theia-border-width) solid + var(--theia-inputValidation-errorBorder); } .theia-search-input { - flex-grow: 1; - user-select: none; + flex-grow: 1; + user-select: none; } .theia-search-box > .theia-search-buttons-wrapper { - max-width: 0px; - transition: max-width .2s ease-out; - display: flex; - box-sizing: border-box; - align-items: center; + max-width: 0px; + transition: max-width 0.2s ease-out; + display: flex; + box-sizing: border-box; + align-items: center; } -.theia-search-box:hover > .theia-search-buttons-wrapper { - max-width: var(--theia-search-box-max-width); - transition: max-width .2s ease-in; +.theia-search-box:hover > .theia-search-buttons-wrapper { + max-width: var(--theia-search-box-max-width); + transition: max-width 0.2s ease-in; } .theia-search-button { - min-width: 1rem; - text-align: center; - flex-grow: 0; - font-family: FontAwesome; - font-size: calc(var(--theia-content-font-size) * 0.8); - color: var(--theia-editorWidget-foreground); + min-width: 1rem; + text-align: center; + flex-grow: 0; + font-family: FontAwesome; + font-size: calc(var(--theia-content-font-size) * 0.8); + color: var(--theia-editorWidget-foreground); } .theia-search-button.codicon.codicon-filter { - color: var(--theia-editorWidget-foreground); - align-self: flex-end; - margin-left: var(--theia-search-box-spacing); + color: var(--theia-editorWidget-foreground); + align-self: flex-end; + margin-left: var(--theia-search-box-spacing); } .theia-search-button.codicon-filter:not(.filter-active):before { - content: "\eb85"; + content: "\eb85"; } .theia-search-button.codicon-filter.filter-active:before { - content: "\eb83"; + content: "\eb83"; } .theia-search-button-next:before { - content: "\f107"; + content: "\f107"; } .theia-search-button-next:hover, .theia-search-button-previous:hover, .theia-search-button-close:hover, .theia-search-button.codicon-filter:hover { - cursor: pointer; + cursor: pointer; } .theia-search-button-next:hover:before { - content: "\f107"; + content: "\f107"; } .theia-search-button-previous:before { - content: "\f106"; + content: "\f106"; } .theia-search-button-previous:hover:before { - content: "\f106"; + content: "\f106"; } .theia-search-button-close:before { - content: "\f00d"; - } + content: "\f00d"; +} .theia-search-button-close:hover:before { - content: "\f00d"; + content: "\f00d"; } .theia-non-selectable { - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; - cursor: default; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + cursor: default; } diff --git a/packages/core/src/browser/style/select-component.css b/packages/core/src/browser/style/select-component.css index c1532447c14ac..1165b40bc6002 100644 --- a/packages/core/src/browser/style/select-component.css +++ b/packages/core/src/browser/style/select-component.css @@ -11,88 +11,96 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-select-component { - background-color: var(--theia-dropdown-background); - cursor: pointer; - outline: var(--theia-dropdown-border) solid 1px; - outline-offset: -1px; - min-height: 23px; - min-width: 90px; - padding: 0px 8px; - display: flex; - align-items: center; - user-select: none; + background-color: var(--theia-dropdown-background); + cursor: pointer; + outline: var(--theia-dropdown-border) solid 1px; + outline-offset: -1px; + min-height: 23px; + min-width: 90px; + padding: 0px 8px; + display: flex; + align-items: center; + user-select: none; } .theia-select-component .theia-select-component-label { - width: 100%; - color: var(--theia-dropdown-foreground); - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; + width: 100%; + color: var(--theia-dropdown-foreground); + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } .theia-select-component:focus { - outline-color: var(--theia-focusBorder); + outline-color: var(--theia-focusBorder); } .theia-select-component-dropdown { - font-family: var(--theia-ui-font-family); - font-size: var(--theia-ui-font-size1); - color: var(--theia-foreground); - background-color: var(--theia-settings-dropdownBackground); - outline: var(--theia-focusBorder) solid 1px; - outline-offset: -1px; - user-select: none; - overflow: auto; + font-family: var(--theia-ui-font-family); + font-size: var(--theia-ui-font-size1); + color: var(--theia-foreground); + background-color: var(--theia-settings-dropdownBackground); + outline: var(--theia-focusBorder) solid 1px; + outline-offset: -1px; + user-select: none; + overflow: auto; } .theia-select-component-dropdown .theia-select-component-option { - text-overflow: ellipsis; - overflow: hidden; - display: flex; - padding: 0px 5px; - line-height: 22px; + text-overflow: ellipsis; + overflow: hidden; + display: flex; + padding: 0px 5px; + line-height: 22px; } .theia-select-component-dropdown .theia-select-component-description { - padding: 6px 5px; + padding: 6px 5px; } -.theia-select-component-dropdown .theia-select-component-description:first-child { - border-bottom: 1px solid var(--theia-editorWidget-border); - margin-bottom: 2px; +.theia-select-component-dropdown + .theia-select-component-description:first-child { + border-bottom: 1px solid var(--theia-editorWidget-border); + margin-bottom: 2px; } -.theia-select-component-dropdown .theia-select-component-description:last-child { - border-top: 1px solid var(--theia-editorWidget-border); - margin-top: 2px; +.theia-select-component-dropdown + .theia-select-component-description:last-child { + border-top: 1px solid var(--theia-editorWidget-border); + margin-top: 2px; } -.theia-select-component-dropdown .theia-select-component-option .theia-select-component-option-value { - width: 100%; +.theia-select-component-dropdown + .theia-select-component-option + .theia-select-component-option-value { + width: 100%; } -.theia-select-component-dropdown .theia-select-component-option .theia-select-component-option-detail { - padding-left: 4px; +.theia-select-component-dropdown + .theia-select-component-option + .theia-select-component-option-detail { + padding-left: 4px; } -.theia-select-component-dropdown .theia-select-component-option:not(.selected) .theia-select-component-option-detail { - color: var(--theia-textLink-foreground); +.theia-select-component-dropdown + .theia-select-component-option:not(.selected) + .theia-select-component-option-detail { + color: var(--theia-textLink-foreground); } .theia-select-component-dropdown .theia-select-component-option.selected { - color: var(--theia-list-activeSelectionForeground); - cursor: pointer; - background: var(--theia-list-activeSelectionBackground); + color: var(--theia-list-activeSelectionForeground); + cursor: pointer; + background: var(--theia-list-activeSelectionBackground); } .theia-select-component-dropdown .theia-select-component-separator { - width: 84px; - height: 1px; - margin: 3px 3px; - background: var(--theia-foreground); + width: 84px; + height: 1px; + margin: 3px 3px; + background: var(--theia-foreground); } diff --git a/packages/core/src/browser/style/sidepanel.css b/packages/core/src/browser/style/sidepanel.css index 3dc31323b6db6..161d327aa081c 100644 --- a/packages/core/src/browser/style/sidepanel.css +++ b/packages/core/src/browser/style/sidepanel.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /*----------------------------------------------------------------------------- @@ -28,7 +28,6 @@ --theia-private-sidebar-icon-size: 24px; } - /*----------------------------------------------------------------------------- | SideBars (left and right) |----------------------------------------------------------------------------*/ @@ -51,13 +50,13 @@ } .p-TabBar.theia-app-sides .p-TabBar-tab { - position: relative; - background: var(--theia-activityBar-background); - flex-direction: column; - justify-content: center; - align-items: center; - min-height: var(--theia-private-sidebar-tab-height); - cursor: pointer; + position: relative; + background: var(--theia-activityBar-background); + flex-direction: column; + justify-content: center; + align-items: center; + min-height: var(--theia-private-sidebar-tab-height); + cursor: pointer; } .p-TabBar.theia-app-sides .p-TabBar-tab.p-mod-current, @@ -72,13 +71,11 @@ .p-TabBar.theia-app-left .p-TabBar-tab.p-mod-current { border-top-color: transparent; box-shadow: 2px 0 0 var(--theia-activityBar-activeBorder) inset; - } .p-TabBar.theia-app-right .p-TabBar-tab.p-mod-current { - border-top-color: transparent; - box-shadow: -2px 0 0 var(--theia-activityBar-activeBorder) inset; - + border-top-color: transparent; + box-shadow: -2px 0 0 var(--theia-activityBar-activeBorder) inset; } .p-TabBar.theia-app-sides .p-TabBar-tabLabel, @@ -149,11 +146,13 @@ } #theia-left-content-panel > .p-Panel { - border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-border); + border-right: var(--theia-panel-border-width) solid + var(--theia-activityBar-border); } #theia-right-content-panel > .p-Panel { - border-left: var(--theia-panel-border-width) solid var(--theia-activityBar-border); + border-left: var(--theia-panel-border-width) solid + var(--theia-activityBar-border); } .theia-side-panel { @@ -162,7 +161,7 @@ .p-Widget.theia-side-panel .p-Widget, .p-Widget .theia-sidepanel-toolbar { - color: var(--theia-sideBar-foreground); + color: var(--theia-sideBar-foreground); } .theia-app-sidebar-container { @@ -188,7 +187,8 @@ } .p-Widget.theia-sidebar-menu i { - padding: var(--theia-private-sidebar-tab-padding-top-and-bottom) var(--theia-private-sidebar-tab-padding-left-and-right); + padding: var(--theia-private-sidebar-tab-padding-top-and-bottom) + var(--theia-private-sidebar-tab-padding-left-and-right); display: flex; justify-content: center; align-items: center; @@ -219,9 +219,14 @@ z-index: 1000; } -#theia-app-shell .p-TabBar.theia-app-sides > .ps__rail-y >.ps__thumb-y { +#theia-app-shell .p-TabBar.theia-app-sides > .ps__rail-y > .ps__thumb-y { width: var(--theia-private-sidebar-scrollbar-width); - right: calc((var(--theia-private-sidebar-scrollbar-rail-width) - var(--theia-private-sidebar-scrollbar-width)) / 2); + right: calc( + ( + var(--theia-private-sidebar-scrollbar-rail-width) - + var(--theia-private-sidebar-scrollbar-width) + ) / 2 + ); } .p-TabBar.theia-app-sides > .ps__rail-y:hover, @@ -232,50 +237,61 @@ .p-TabBar.theia-app-sides > .ps__rail-y:hover > .ps__thumb-y, .p-TabBar.theia-app-sides > .ps__rail-y:focus > .ps__thumb-y { width: var(--theia-private-sidebar-scrollbar-width); - right: calc((var(--theia-private-sidebar-scrollbar-rail-width) - var(--theia-private-sidebar-scrollbar-width)) / 2); + right: calc( + ( + var(--theia-private-sidebar-scrollbar-rail-width) - + var(--theia-private-sidebar-scrollbar-width) + ) / 2 + ); } - /*----------------------------------------------------------------------------- | Bottom content panel |----------------------------------------------------------------------------*/ #theia-bottom-content-panel { - background: var(--theia-panel-background); + background: var(--theia-panel-background); } #theia-bottom-content-panel .theia-input { - border-color: var(--theia-panelInput-border); + border-color: var(--theia-panelInput-border); } -#theia-bottom-content-panel .p-DockPanel-handle[data-orientation='horizontal'] { - border-left: var(--theia-border-width) solid var(--theia-panel-border); +#theia-bottom-content-panel .p-DockPanel-handle[data-orientation="horizontal"] { + border-left: var(--theia-border-width) solid var(--theia-panel-border); } #theia-bottom-content-panel .p-TabBar { - border-top: var(--theia-border-width) solid var(--theia-panel-border); - background: inherit; + border-top: var(--theia-border-width) solid var(--theia-panel-border); + background: inherit; } #theia-bottom-content-panel .p-TabBar-tab { - background: inherit; + background: inherit; } #theia-bottom-content-panel .p-TabBar-tab:not(.p-mod-current) { - color: var(--theia-panelTitle-inactiveForeground); + color: var(--theia-panelTitle-inactiveForeground); } #theia-bottom-content-panel .p-TabBar-tab.p-mod-current { - color: var(--theia-panelTitle-activeForeground); - box-shadow: 0 var(--theia-border-width) 0 var(--theia-panelTitle-activeBorder) inset; + color: var(--theia-panelTitle-activeForeground); + box-shadow: 0 var(--theia-border-width) 0 var(--theia-panelTitle-activeBorder) + inset; } -#theia-bottom-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab .theia-tab-icon-label { - color: var(--theia-tab-unfocusedInactiveForeground); +#theia-bottom-content-panel + .p-TabBar:not(.theia-tabBar-active) + .p-TabBar-tab + .theia-tab-icon-label { + color: var(--theia-tab-unfocusedInactiveForeground); } -#theia-bottom-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-tab.p-mod-current .theia-tab-icon-label { - color: var(--theia-tab-unfocusedActiveForeground); +#theia-bottom-content-panel + .p-TabBar:not(.theia-tabBar-active) + .p-TabBar-tab.p-mod-current + .theia-tab-icon-label { + color: var(--theia-tab-unfocusedActiveForeground); } /*----------------------------------------------------------------------------- @@ -305,30 +321,33 @@ |----------------------------------------------------------------------------*/ .theia-sidepanel-toolbar { - min-height: calc(var(--theia-private-horizontal-tab-height) + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2); - display: flex; - padding-left: 5px; - align-items: center; - background-color: var(--theia-sideBar-background); + min-height: calc( + var(--theia-private-horizontal-tab-height) + + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2 + ); + display: flex; + padding-left: 5px; + align-items: center; + background-color: var(--theia-sideBar-background); } .theia-sidepanel-toolbar .theia-sidepanel-title { - color: var(--theia-settings-headerForeground); - flex: 1; - margin-left: 14px; - text-transform: uppercase; - font-size: var(--theia-ui-font-size0); - min-width: 1rem; + color: var(--theia-settings-headerForeground); + flex: 1; + margin-left: 14px; + text-transform: uppercase; + font-size: var(--theia-ui-font-size0); + min-width: 1rem; } .theia-sidepanel-toolbar .p-TabBar-toolbar .item { - color: var(--theia-icon-foreground); + color: var(--theia-icon-foreground); } -.theia-sidepanel-toolbar .p-TabBar-toolbar .item > div{ - height: 18px; - width: 18px; - background-repeat: no-repeat; +.theia-sidepanel-toolbar .p-TabBar-toolbar .item > div { + height: 18px; + width: 18px; + background-repeat: no-repeat; } .noWrapInfo { diff --git a/packages/core/src/browser/style/status-bar.css b/packages/core/src/browser/style/status-bar.css index 81a581770e647..84c53eda5af0c 100644 --- a/packages/core/src/browser/style/status-bar.css +++ b/packages/core/src/browser/style/status-bar.css @@ -11,108 +11,109 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-statusBar-height: 22px; + --theia-statusBar-height: 22px; } #theia-statusBar { - background: var(--theia-statusBar-background); - display: flex; - min-height: var(--theia-statusBar-height); - white-space: nowrap; - border-top: var(--theia-border-width) solid var(--theia-statusBar-border); + background: var(--theia-statusBar-background); + display: flex; + min-height: var(--theia-statusBar-height); + white-space: nowrap; + border-top: var(--theia-border-width) solid var(--theia-statusBar-border); } body.theia-no-open-workspace #theia-statusBar { - background: var(--theia-statusBar-noFolderBackground); - color: var(--theia-statusBar-noFolderForeground); - border-top: var(--theia-border-width) solid var(--theia-statusBar-noFolderBorder); + background: var(--theia-statusBar-noFolderBackground); + color: var(--theia-statusBar-noFolderForeground); + border-top: var(--theia-border-width) solid + var(--theia-statusBar-noFolderBorder); } #theia-statusBar .area { - flex: 1; - display: flex; - align-items: stretch; + flex: 1; + display: flex; + align-items: stretch; } #theia-statusBar .area.left { - justify-content: flex-start; - padding-left: calc(var(--theia-ui-padding)*2); + justify-content: flex-start; + padding-left: calc(var(--theia-ui-padding) * 2); } #theia-statusBar .area.right { - justify-content: flex-end; - padding-right: calc(var(--theia-ui-padding)*2); + justify-content: flex-end; + padding-right: calc(var(--theia-ui-padding) * 2); } #theia-statusBar .area .element { - color: var(--theia-statusBar-foreground); - display: flex; - align-items: center; - font-size: var(--theia-statusBar-font-size); + color: var(--theia-statusBar-foreground); + display: flex; + align-items: center; + font-size: var(--theia-statusBar-font-size); } -#theia-statusBar .area .element>* { - margin-left: calc(var(--theia-ui-padding)/2); +#theia-statusBar .area .element > * { + margin-left: calc(var(--theia-ui-padding) / 2); } #theia-statusBar .area .element .codicon { - /* Scaling down codicons from 16 to 14 pixels */ - font-size: 14px; + /* Scaling down codicons from 16 to 14 pixels */ + font-size: 14px; } -#theia-statusBar .area .element>*:last-child { - margin-right: calc(var(--theia-ui-padding)/2); +#theia-statusBar .area .element > *:last-child { + margin-right: calc(var(--theia-ui-padding) / 2); } .theia-mod-offline #theia-statusBar { - background-color: var(--theia-statusBar-offlineBackground) !important; + background-color: var(--theia-statusBar-offlineBackground) !important; } .theia-mod-offline #theia-statusBar .area .element { - color: var(--theia-statusBar-offlineForeground) !important; + color: var(--theia-statusBar-offlineForeground) !important; } #theia-statusBar .area.left .element { - margin-right: var(--theia-ui-padding); + margin-right: var(--theia-ui-padding); } #theia-statusBar .area.right .element { - margin-left: var(--theia-ui-padding); + margin-left: var(--theia-ui-padding); } #theia-statusBar .area.right .element.compact-right, -#theia-statusBar .area.right .element.compact-left+.element { - margin-left: 0; +#theia-statusBar .area.right .element.compact-left + .element { + margin-left: 0; } #theia-statusBar .area.left .element.compact-left { - margin-right: 0; + margin-right: 0; } #theia-statusBar .area.left .element.compact-right { - margin-left: calc(-1 * var(--theia-ui-padding)); + margin-left: calc(-1 * var(--theia-ui-padding)); } #theia-statusBar .area .element.hasCommand:hover { - cursor: pointer; + cursor: pointer; } #theia-statusBar .area .element.hasCommand:active { - cursor: pointer; + cursor: pointer; } - #theia-statusBar .element { - /* https://css-tricks.com/os-specific-fonts-css/#article-header-id-0 */ - /* https://github.com/Microsoft/vscode/blob/5dbdc8d19c8cf6dd10d558eabcc48bba962ea45f/src/vs/workbench/browser/media/style.css#L8-L24 */ - font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Ubuntu", "Droid Sans", sans-serif; - font-size: 12px; - text-rendering: auto; - text-decoration: none; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + /* https://css-tricks.com/os-specific-fonts-css/#article-header-id-0 */ + /* https://github.com/Microsoft/vscode/blob/5dbdc8d19c8cf6dd10d558eabcc48bba962ea45f/src/vs/workbench/browser/media/style.css#L8-L24 */ + font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", + "Ubuntu", "Droid Sans", sans-serif; + font-size: 12px; + text-rendering: auto; + text-decoration: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } diff --git a/packages/core/src/browser/style/tooltip.css b/packages/core/src/browser/style/tooltip.css index 8c458474e4042..33d8853218eef 100644 --- a/packages/core/src/browser/style/tooltip.css +++ b/packages/core/src/browser/style/tooltip.css @@ -11,18 +11,18 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-tooltip { - color: var(--theia-editorHoverWidget-foreground) !important; - background: var(--theia-editorHoverWidget-background) !important; - border: 1px solid !important; - border-color: var(--theia-editorHoverWidget-border) !important; + color: var(--theia-editorHoverWidget-foreground) !important; + background: var(--theia-editorHoverWidget-background) !important; + border: 1px solid !important; + border-color: var(--theia-editorHoverWidget-border) !important; } /* Hide tooltip arrow */ .theia-tooltip::before, .theia-tooltip::after { - border: none !important; + border: none !important; } diff --git a/packages/core/src/browser/style/tree-decorators.css b/packages/core/src/browser/style/tree-decorators.css index 3fde5064080a6..e3ea1ad29b936 100644 --- a/packages/core/src/browser/style/tree-decorators.css +++ b/packages/core/src/browser/style/tree-decorators.css @@ -11,71 +11,71 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-caption-prefix { - white-space: nowrap; - padding-right: 2px; + white-space: nowrap; + padding-right: 2px; } .theia-caption-suffix { - white-space: nowrap; - padding: 0px 2px 0px 2px; + white-space: nowrap; + padding: 0px 2px 0px 2px; } .theia-caption-suffix-tail { - min-width: 1rem; - text-align: center; - font-size: var(--theia-ui-font-size0); + min-width: 1rem; + text-align: center; + font-size: var(--theia-ui-font-size0); } .theia-icon-wrapper { - top: 0px !important; - position: relative; - display: inline-flex; + top: 0px !important; + position: relative; + display: inline-flex; } .theia-decorator-size { - transform: scale(0.7); - text-align: center; - height: 100%; - width: 100%; + transform: scale(0.7); + text-align: center; + height: 100%; + width: 100%; } .theia-decorator-sidebar-size { - height: 100%; - text-align: center; - transform: scale(1.2); - width: 100%; + height: 100%; + text-align: center; + transform: scale(1.2); + width: 100%; } .theia-top-right { - position: absolute; - bottom: 40%; - left: 25%; + position: absolute; + bottom: 40%; + left: 25%; } .theia-bottom-right { - position: absolute; - top: 40%; - left: 25%; + position: absolute; + top: 40%; + left: 25%; } .theia-bottom-right-sidebar { - position: absolute; - top: 80%; - left: 50%; + position: absolute; + top: 80%; + left: 50%; } .theia-bottom-left { - position: absolute; - top: 40%; - right: 25%; + position: absolute; + top: 40%; + right: 25%; } .theia-top-left { - position: absolute; - bottom: 40%; - right: 25%; + position: absolute; + bottom: 40%; + right: 25%; } diff --git a/packages/core/src/browser/style/tree.css b/packages/core/src/browser/style/tree.css index e2f42470387d6..66b01d30367ca 100644 --- a/packages/core/src/browser/style/tree.css +++ b/packages/core/src/browser/style/tree.css @@ -11,211 +11,215 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-welcomeView-horizontal-padding: 20px; - --theia-welcomeView-elements-margin: 13px; - --theia-welcomeView-button-maxWidth: 260px; + --theia-welcomeView-horizontal-padding: 20px; + --theia-welcomeView-elements-margin: 13px; + --theia-welcomeView-button-maxWidth: 260px; } .theia-Tree { - overflow: hidden; - font-size: var(--theia-ui-font-size1); - max-height: calc(100% - var(--theia-border-width)); - position: relative; + overflow: hidden; + font-size: var(--theia-ui-font-size1); + max-height: calc(100% - var(--theia-border-width)); + position: relative; } .theia-Tree:focus .theia-TreeContainer.empty::before, .theia-Tree:focus .theia-TreeContainer.focused::before { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - pointer-events: none; - z-index: 10; - content: ""; - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1 !important; - outline-color: var(--theia-focusBorder); + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + pointer-events: none; + z-index: 10; + content: ""; + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + opacity: 1 !important; + outline-color: var(--theia-focusBorder); } .theia-Tree:focus, .theia-TreeContainer .ReactVirtualized__List:focus { - outline: 0; - box-shadow: none; - border: none; + outline: 0; + box-shadow: none; + border: none; } .theia-TreeContainer .ReactVirtualized__Grid__innerScrollContainer { - margin-bottom: calc(var(--theia-ui-padding) * 3); + margin-bottom: calc(var(--theia-ui-padding) * 3); } .theia-TreeContainer { - height: 100%; + height: 100%; } .theia-TreeNode { - line-height: var(--theia-content-line-height); - display: flex; + line-height: var(--theia-content-line-height); + display: flex; } .theia-TreeNode:hover { - background: var(--theia-list-hoverBackground); - color: var(--theia-list-hoverForeground); - cursor: pointer; + background: var(--theia-list-hoverBackground); + color: var(--theia-list-hoverForeground); + cursor: pointer; } .theia-TreeNodeContent { - display: flex; - align-items: center; - width: calc(100% - var(--theia-scrollbar-rail-width)); + display: flex; + align-items: center; + width: calc(100% - var(--theia-scrollbar-rail-width)); } .theia-ExpansionToggle { - display: flex; - justify-content: center; - padding-left: calc(var(--theia-ui-padding)/2); - padding-right: calc(var(--theia-ui-padding)/2); - min-width: var(--theia-icon-size); - min-height: var(--theia-icon-size); + display: flex; + justify-content: center; + padding-left: calc(var(--theia-ui-padding) / 2); + padding-right: calc(var(--theia-ui-padding) / 2); + min-width: var(--theia-icon-size); + min-height: var(--theia-icon-size); } .theia-ExpansionToggle.theia-mod-busy { - animation: theia-spin 1.25s linear infinite; + animation: theia-spin 1.25s linear infinite; } .theia-ExpansionToggle:not(.theia-mod-busy):hover { - cursor: pointer; + cursor: pointer; } .theia-ExpansionToggle.theia-mod-collapsed:not(.theia-mod-busy) { - transform: rotate(-90deg); + transform: rotate(-90deg); } .theia-Tree:focus-within .theia-TreeNode.theia-mod-selected { - background: var(--theia-list-activeSelectionBackground); - color: var(--theia-list-activeSelectionForeground) !important; - outline: var(--theia-focusBorder) solid 1px; - outline-offset: -1px; + background: var(--theia-list-activeSelectionBackground); + color: var(--theia-list-activeSelectionForeground) !important; + outline: var(--theia-focusBorder) solid 1px; + outline-offset: -1px; } .theia-Tree:focus-within .theia-TreeNode.theia-mod-selected .theia-TreeNodeTail, -.theia-Tree:focus-within .theia-TreeNode.theia-mod-selected .theia-caption-suffix, +.theia-Tree:focus-within + .theia-TreeNode.theia-mod-selected + .theia-caption-suffix, .theia-Tree:focus-within .theia-TreeNode.theia-mod-selected .theia-TreeNodeInfo, -.theia-Tree:focus-within .theia-TreeNode.theia-mod-selected .theia-TreeNodeSegment { - color: var(--theia-list-activeSelectionForeground) !important; +.theia-Tree:focus-within + .theia-TreeNode.theia-mod-selected + .theia-TreeNodeSegment { + color: var(--theia-list-activeSelectionForeground) !important; } .theia-Tree:focus .theia-TreeNode.theia-mod-focus, .theia-Tree .ReactVirtualized__List:focus .theia-TreeNode.theia-mod-focus { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - outline-color: var(--theia-focusBorder); + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + outline-color: var(--theia-focusBorder); } .theia-TreeNodeInfo { - color: var(--theia-foreground); - opacity: 0.7; + color: var(--theia-foreground); + opacity: 0.7; } .theia-Tree .theia-TreeNode.theia-mod-selected { - background: var(--theia-list-inactiveSelectionBackground); - color: var(--theia-list-inactiveSelectionForeground); + background: var(--theia-list-inactiveSelectionBackground); + color: var(--theia-list-inactiveSelectionForeground); } .theia-TreeNode.theia-mod-not-selectable { - color: var(--theia-descriptionForeground); + color: var(--theia-descriptionForeground); } .theia-TreeNode.theia-mod-not-selectable:hover { - background: none; - cursor: default; + background: none; + cursor: default; } .theia-TreeNodeSegment { - align-items: center; - flex-grow: 0; - user-select: none; - white-space: nowrap; + align-items: center; + flex-grow: 0; + user-select: none; + white-space: nowrap; } .theia-TreeNodeSegment.flex { - display: flex; + display: flex; } .theia-TreeNodeSegmentGrow { - flex-grow: 1 !important; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + flex-grow: 1 !important; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .theia-TreeNodeTail { - min-width: 1rem; - text-align: center; - justify-content: center; + min-width: 1rem; + text-align: center; + justify-content: center; } .theia-TreeNodeSegment mark { - background-color: var(--theia-list-filterMatchBackground); - color: var(--theia-list-inactiveSelectionForeground); + background-color: var(--theia-list-filterMatchBackground); + color: var(--theia-list-inactiveSelectionForeground); } .theia-tree-source-node-placeholder { - text-align: center; - font-style: italic; - opacity: var(--theia-mod-disabled-opacity); + text-align: center; + font-style: italic; + opacity: var(--theia-mod-disabled-opacity); } .theia-tree-node-indent { - position: absolute; - height: var(--theia-content-line-height); - border-right: var(--theia-border-width) solid transparent; - pointer-events: none; + position: absolute; + height: var(--theia-content-line-height); + border-right: var(--theia-border-width) solid transparent; + pointer-events: none; } .theia-tree-node-indent.always, .theia-TreeContainer:hover .theia-tree-node-indent.hover { - border-color: var(--theia-tree-inactiveIndentGuidesStroke); + border-color: var(--theia-tree-inactiveIndentGuidesStroke); } .theia-tree-node-indent.active { - border-color: var(--theia-tree-indentGuidesStroke); + border-color: var(--theia-tree-indentGuidesStroke); } .theia-TreeContainer .theia-WelcomeView { - padding-top: var(--theia-ui-padding); - padding-right: var(--theia-welcomeView-horizontal-padding); - padding-left: var(--theia-welcomeView-horizontal-padding); + padding-top: var(--theia-ui-padding); + padding-right: var(--theia-welcomeView-horizontal-padding); + padding-left: var(--theia-welcomeView-horizontal-padding); } .theia-TreeContainer .theia-WelcomeView > * { - margin: var(--theia-welcomeView-elements-margin) 0; + margin: var(--theia-welcomeView-elements-margin) 0; } .theia-TreeContainer .theia-WelcomeView .theia-WelcomeViewButtonWrapper { - display: flex; - padding: 0 var(--theia-ui-padding); + display: flex; + padding: 0 var(--theia-ui-padding); } .theia-TreeContainer .theia-WelcomeView .theia-WelcomeViewButton { - width: 100%; - max-width: var(--theia-welcomeView-button-maxWidth); - margin: auto; + width: 100%; + max-width: var(--theia-welcomeView-button-maxWidth); + margin: auto; } .theia-TreeContainer .theia-WelcomeView .theia-WelcomeViewCommandLink { - cursor: pointer; + cursor: pointer; } .theia-TreeContainer .theia-WelcomeView .theia-WelcomeViewCommandLink.disabled { - pointer-events: none; - cursor: default; - opacity: var(--theia-mod-disabled-opacity); + pointer-events: none; + cursor: default; + opacity: var(--theia-mod-disabled-opacity); } diff --git a/packages/core/src/browser/style/view-container.css b/packages/core/src/browser/style/view-container.css index 3e6b113b14a2e..4b4657deedec7 100644 --- a/packages/core/src/browser/style/view-container.css +++ b/packages/core/src/browser/style/view-container.css @@ -11,164 +11,177 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-view-container-title-height: var(--theia-content-line-height); - --theia-view-container-content-height: calc(100% - var(--theia-view-container-title-height)); + --theia-view-container-title-height: var(--theia-content-line-height); + --theia-view-container-content-height: calc( + 100% - var(--theia-view-container-title-height) + ); } - .theia-view-container { - height: 100%; - display: flex; - flex-direction: column; + height: 100%; + display: flex; + flex-direction: column; } .theia-view-container > .p-SplitPanel { - height: 100%; - width: 100%; + height: 100%; + width: 100%; } .theia-view-container > .p-SplitPanel > .p-SplitPanel-child { - min-width: 50px; - min-height: var(--theia-content-line-height); + min-width: 50px; + min-height: var(--theia-content-line-height); } .theia-view-container > .p-SplitPanel > .p-SplitPanel-handle::after { - min-height: 2px; - min-width: 2px; + min-height: 2px; + min-width: 2px; } .p-SplitPanel > .p-SplitPanel-handle:hover::after { - background-color: var(--theia-sash-hoverBorder); - transition-delay: var(--theia-sash-hoverDelay); + background-color: var(--theia-sash-hoverBorder); + transition-delay: var(--theia-sash-hoverDelay); } .p-SplitPanel > .p-SplitPanel-handle:active::after { - background-color: var(--theia-sash-activeBorder); - transition-delay: 0s !important; + background-color: var(--theia-sash-activeBorder); + transition-delay: 0s !important; } -.p-SplitPanel[data-orientation='horizontal'] > .p-SplitPanel-handle::after { - min-width: var(--theia-sash-width); +.p-SplitPanel[data-orientation="horizontal"] > .p-SplitPanel-handle::after { + min-width: var(--theia-sash-width); } -.p-SplitPanel[data-orientation='vertical'] > .p-SplitPanel-handle::after { - min-height: var(--theia-sash-width); +.p-SplitPanel[data-orientation="vertical"] > .p-SplitPanel-handle::after { + min-height: var(--theia-sash-width); } .theia-view-container .part { - height: 100%; + height: 100%; } .theia-view-container-part-header { - cursor: pointer; - display: flex; - align-items: center; - background: var(--theia-sideBarSectionHeader-background); - line-height: var(--theia-view-container-title-height); - z-index: 10; - color: var(--theia-sideBarSectionHeader-foreground); - font-weight: 700; + cursor: pointer; + display: flex; + align-items: center; + background: var(--theia-sideBarSectionHeader-background); + line-height: var(--theia-view-container-title-height); + z-index: 10; + color: var(--theia-sideBarSectionHeader-foreground); + font-weight: 700; } .p-Widget > .theia-view-container-part-header { - box-shadow: 0 1px 0 var(--theia-sideBarSectionHeader-border) inset; + box-shadow: 0 1px 0 var(--theia-sideBarSectionHeader-border) inset; } .p-Widget.p-first-visible > .theia-view-container-part-header { - box-shadow: none; + box-shadow: none; } .theia-view-container-part-header .theia-ExpansionToggle { - padding-left: 4px; + padding-left: 4px; } -.theia-view-container > .p-SplitPanel[data-orientation='horizontal'] .part > .theia-header .theia-ExpansionToggle::before { - display: none; - padding-left: 0px; +.theia-view-container + > .p-SplitPanel[data-orientation="horizontal"] + .part + > .theia-header + .theia-ExpansionToggle::before { + display: none; + padding-left: 0px; } -.theia-view-container > .p-SplitPanel[data-orientation='horizontal'] .part > .theia-header .theia-ExpansionToggle { - padding-left: 0px; +.theia-view-container + > .p-SplitPanel[data-orientation="horizontal"] + .part + > .theia-header + .theia-ExpansionToggle { + padding-left: 0px; } .theia-view-container-part-header .label { - flex: 0; - white-space: nowrap; - text-overflow: ellipsis; + flex: 0; + white-space: nowrap; + text-overflow: ellipsis; } .theia-view-container-part-header .description { - flex: 1; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - padding-left: var(--theia-ui-padding); - text-transform: none; - opacity: 0.6; + flex: 1; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding-left: var(--theia-ui-padding); + text-transform: none; + opacity: 0.6; } .theia-view-container-part-header .notification-count-container { - margin-right: 12px; + margin-right: 12px; } .theia-view-container .part > .body { - height: var(--theia-view-container-content-height); - min-width: 50px; - min-height: 50px; - position: relative; + height: var(--theia-view-container-content-height); + min-width: 50px; + min-height: 50px; + position: relative; } .theia-view-container .part > .body .theia-tree-source-node-placeholder { - padding-top: 4px; - height: 100%; + padding-top: 4px; + height: 100%; } .theia-view-container .part:hover > .body { - display: block; + display: block; } .theia-view-container .part.drop-target { - background: var(--theia-list-dropBackground); - border: var(--theia-border-width) dashed var(--theia-contrastActiveBorder); - transition-property: top, left, right, bottom; - transition-duration: 150ms; - transition-timing-function: ease; + background: var(--theia-list-dropBackground); + border: var(--theia-border-width) dashed var(--theia-contrastActiveBorder); + transition-property: top, left, right, bottom; + transition-duration: 150ms; + transition-timing-function: ease; } .theia-view-container-drag-image { - background: var(--theia-sideBarSectionHeader-background); - color: var(--theia-sideBarSectionHeader-foreground); - line-height: var(--theia-content-line-height); - position: absolute; - z-index: 999; - text-transform: uppercase; - font-size: var(--theia-ui-font-size0); - font-weight: 500; - padding: 0 var(--theia-ui-padding) 0 var(--theia-ui-padding); + background: var(--theia-sideBarSectionHeader-background); + color: var(--theia-sideBarSectionHeader-foreground); + line-height: var(--theia-content-line-height); + position: absolute; + z-index: 999; + text-transform: uppercase; + font-size: var(--theia-ui-font-size0); + font-weight: 500; + padding: 0 var(--theia-ui-padding) 0 var(--theia-ui-padding); } .p-TabBar-toolbar.theia-view-container-part-title { - padding: 0px; - padding-right: calc(var(--theia-ui-padding)*2/3); + padding: 0px; + padding-right: calc(var(--theia-ui-padding) * 2 / 3); } .theia-view-container-part-title .item > div { - height: var(--theia-icon-size); - width: var(--theia-icon-size); - background-size: var(--theia-icon-size); - line-height: var(--theia-icon-size); + height: var(--theia-icon-size); + width: var(--theia-icon-size); + background-size: var(--theia-icon-size); + line-height: var(--theia-icon-size); } .theia-view-container-part-title { - display: none; + display: none; } .theia-view-container-part-title.menu-open, -.p-Widget.part:not(.collapsed):hover .theia-view-container-part-header .theia-view-container-part-title, -.p-Widget.part:not(.collapsed):focus-within .theia-view-container-part-header .theia-view-container-part-title { - display: flex; +.p-Widget.part:not(.collapsed):hover + .theia-view-container-part-header + .theia-view-container-part-title, +.p-Widget.part:not(.collapsed):focus-within + .theia-view-container-part-header + .theia-view-container-part-title { + display: flex; } diff --git a/packages/core/src/browser/style/widget.css b/packages/core/src/browser/style/widget.css index d9c188b8759d9..08e0254ff0beb 100644 --- a/packages/core/src/browser/style/widget.css +++ b/packages/core/src/browser/style/widget.css @@ -11,9 +11,9 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-widget-noInfo { - padding: calc(var(--theia-ui-padding) * 2); + padding: calc(var(--theia-ui-padding) * 2); } diff --git a/packages/core/src/browser/styling-service.ts b/packages/core/src/browser/styling-service.ts index ea0406204af8a..fbed8e2cab9ce 100644 --- a/packages/core/src/browser/styling-service.ts +++ b/packages/core/src/browser/styling-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/browser/supported-encodings.ts b/packages/core/src/browser/supported-encodings.ts index 2f5701f4a2021..edcdf7cb1aff8 100644 --- a/packages/core/src/browser/supported-encodings.ts +++ b/packages/core/src/browser/supported-encodings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from vscode: https://github.com/microsoft/vscode/blob/master/src/vs/workbench/services/textfile/common/textfiles.ts diff --git a/packages/core/src/browser/test/jsdom.ts b/packages/core/src/browser/test/jsdom.ts index e3cee9738e1db..a51d0a323125e 100644 --- a/packages/core/src/browser/test/jsdom.ts +++ b/packages/core/src/browser/test/jsdom.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line import/no-extraneous-dependencies diff --git a/packages/core/src/browser/test/mock-connection-status-service.ts b/packages/core/src/browser/test/mock-connection-status-service.ts index 2acc5b2590e54..41a46bbb109f6 100644 --- a/packages/core/src/browser/test/mock-connection-status-service.ts +++ b/packages/core/src/browser/test/mock-connection-status-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MockLogger } from '../../common/test/mock-logger'; diff --git a/packages/core/src/browser/test/mock-env-variables-server.ts b/packages/core/src/browser/test/mock-env-variables-server.ts index 9fcea63239427..26c30ec294fbf 100644 --- a/packages/core/src/browser/test/mock-env-variables-server.ts +++ b/packages/core/src/browser/test/mock-env-variables-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '../../common/uri'; diff --git a/packages/core/src/browser/test/mock-opener-service.ts b/packages/core/src/browser/test/mock-opener-service.ts index f9f8c411a4e70..f84f47b4a3463 100644 --- a/packages/core/src/browser/test/mock-opener-service.ts +++ b/packages/core/src/browser/test/mock-opener-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/test/mock-storage-service.ts b/packages/core/src/browser/test/mock-storage-service.ts index 6ed789a5200d4..ecba9447fbf81 100644 --- a/packages/core/src/browser/test/mock-storage-service.ts +++ b/packages/core/src/browser/test/mock-storage-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { StorageService } from '../storage-service'; diff --git a/packages/core/src/browser/theming.ts b/packages/core/src/browser/theming.ts index ddcc47991ee28..4ffd06e3fd0ff 100644 --- a/packages/core/src/browser/theming.ts +++ b/packages/core/src/browser/theming.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter, Event } from '../common/event'; diff --git a/packages/core/src/browser/tooltip-service.tsx b/packages/core/src/browser/tooltip-service.tsx index eb0bbc2419bda..67fbc10285b56 100644 --- a/packages/core/src/browser/tooltip-service.tsx +++ b/packages/core/src/browser/tooltip-service.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/fuzzy-search.spec.ts b/packages/core/src/browser/tree/fuzzy-search.spec.ts index c2a4a059ec77f..e52a42e4a6aed 100644 --- a/packages/core/src/browser/tree/fuzzy-search.spec.ts +++ b/packages/core/src/browser/tree/fuzzy-search.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/tree/fuzzy-search.ts b/packages/core/src/browser/tree/fuzzy-search.ts index 3588408da47bd..00784c9407be3 100644 --- a/packages/core/src/browser/tree/fuzzy-search.ts +++ b/packages/core/src/browser/tree/fuzzy-search.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fuzzy from 'fuzzy'; diff --git a/packages/core/src/browser/tree/index.ts b/packages/core/src/browser/tree/index.ts index 131a8370f314d..2361b0b62280f 100644 --- a/packages/core/src/browser/tree/index.ts +++ b/packages/core/src/browser/tree/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './tree'; diff --git a/packages/core/src/browser/tree/search-box-debounce.ts b/packages/core/src/browser/tree/search-box-debounce.ts index 1df6549f71111..5511c65560901 100644 --- a/packages/core/src/browser/tree/search-box-debounce.ts +++ b/packages/core/src/browser/tree/search-box-debounce.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event, Emitter } from '../../common/event'; diff --git a/packages/core/src/browser/tree/search-box.ts b/packages/core/src/browser/tree/search-box.ts index 51ce96b893500..5d09360ea87ed 100644 --- a/packages/core/src/browser/tree/search-box.ts +++ b/packages/core/src/browser/tree/search-box.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SearchBoxDebounce, SearchBoxDebounceOptions } from '../tree/search-box-debounce'; diff --git a/packages/core/src/browser/tree/test/mock-tree-model.ts b/packages/core/src/browser/tree/test/mock-tree-model.ts index 431fd3511f6c9..ebb04d690ee33 100644 --- a/packages/core/src/browser/tree/test/mock-tree-model.ts +++ b/packages/core/src/browser/tree/test/mock-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TreeNode, CompositeTreeNode } from '../tree'; diff --git a/packages/core/src/browser/tree/test/tree-test-container.ts b/packages/core/src/browser/tree/test/tree-test-container.ts index af5a3cb190c96..37765bc91b9a7 100644 --- a/packages/core/src/browser/tree/test/tree-test-container.ts +++ b/packages/core/src/browser/tree/test/tree-test-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TreeImpl, Tree } from '../tree'; diff --git a/packages/core/src/browser/tree/tree-compression/compressed-tree-expansion-service.ts b/packages/core/src/browser/tree/tree-compression/compressed-tree-expansion-service.ts index e24948cc12e55..fbd466d91ed12 100644 --- a/packages/core/src/browser/tree/tree-compression/compressed-tree-expansion-service.ts +++ b/packages/core/src/browser/tree/tree-compression/compressed-tree-expansion-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-compression/compressed-tree-model.ts b/packages/core/src/browser/tree/tree-compression/compressed-tree-model.ts index 6f6fab7e8d9a0..a2d5c363ec84e 100644 --- a/packages/core/src/browser/tree/tree-compression/compressed-tree-model.ts +++ b/packages/core/src/browser/tree/tree-compression/compressed-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx b/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx index 868e295ad3b79..ee56f7bf3805b 100644 --- a/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx +++ b/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../../../src/browser/tree/tree-compression/tree-compression.css'; diff --git a/packages/core/src/browser/tree/tree-compression/index.ts b/packages/core/src/browser/tree/tree-compression/index.ts index bdeaa19a78c9b..8f631517b24cc 100644 --- a/packages/core/src/browser/tree/tree-compression/index.ts +++ b/packages/core/src/browser/tree/tree-compression/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './compressed-tree-expansion-service'; diff --git a/packages/core/src/browser/tree/tree-compression/tree-compression-service.ts b/packages/core/src/browser/tree/tree-compression/tree-compression-service.ts index 431a0c92abf1d..868524dbd4855 100644 --- a/packages/core/src/browser/tree/tree-compression/tree-compression-service.ts +++ b/packages/core/src/browser/tree/tree-compression/tree-compression-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-compression/tree-compression.css b/packages/core/src/browser/tree/tree-compression/tree-compression.css index 4c547112b6efe..fed54b70bc473 100644 --- a/packages/core/src/browser/tree/tree-compression/tree-compression.css +++ b/packages/core/src/browser/tree/tree-compression/tree-compression.css @@ -11,18 +11,18 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-tree-compressed-selected { - text-decoration: underline; + text-decoration: underline; } .theia-tree-compressed-label-separator { - padding: 0 2px; - opacity: 0.5; + padding: 0 2px; + opacity: 0.5; } .theia-tree-compressed-label-part:hover { - text-decoration: underline; + text-decoration: underline; } diff --git a/packages/core/src/browser/tree/tree-consistency.spec.ts b/packages/core/src/browser/tree/tree-consistency.spec.ts index 11b794fb372d0..4004cb75b3ba0 100644 --- a/packages/core/src/browser/tree/tree-consistency.spec.ts +++ b/packages/core/src/browser/tree/tree-consistency.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/browser/tree/tree-container.spec.ts b/packages/core/src/browser/tree/tree-container.spec.ts index c8e37aa8e29df..9032078024a09 100644 --- a/packages/core/src/browser/tree/tree-container.spec.ts +++ b/packages/core/src/browser/tree/tree-container.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/browser/tree/tree-container.ts b/packages/core/src/browser/tree/tree-container.ts index f21174e218722..569aa8e92a284 100644 --- a/packages/core/src/browser/tree/tree-container.ts +++ b/packages/core/src/browser/tree/tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-decorator.spec.ts b/packages/core/src/browser/tree/tree-decorator.spec.ts index ce31aa937c8f9..0481a1493cdd2 100644 --- a/packages/core/src/browser/tree/tree-decorator.spec.ts +++ b/packages/core/src/browser/tree/tree-decorator.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/tree/tree-decorator.ts b/packages/core/src/browser/tree/tree-decorator.ts index a033c98dc2fc2..a3260ad3b9b71 100644 --- a/packages/core/src/browser/tree/tree-decorator.ts +++ b/packages/core/src/browser/tree/tree-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-expansion.spec.ts b/packages/core/src/browser/tree/tree-expansion.spec.ts index 24e3000451c21..bca6ff1002a66 100644 --- a/packages/core/src/browser/tree/tree-expansion.spec.ts +++ b/packages/core/src/browser/tree/tree-expansion.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect, assert } from 'chai'; diff --git a/packages/core/src/browser/tree/tree-expansion.ts b/packages/core/src/browser/tree/tree-expansion.ts index 9a5bf8088cebd..3bf7e0d5efcbf 100644 --- a/packages/core/src/browser/tree/tree-expansion.ts +++ b/packages/core/src/browser/tree/tree-expansion.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-focus-service.ts b/packages/core/src/browser/tree/tree-focus-service.ts index 15f7bd9fd2046..d1e8a37c41f5a 100644 --- a/packages/core/src/browser/tree/tree-focus-service.ts +++ b/packages/core/src/browser/tree/tree-focus-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-iterator.spec.ts b/packages/core/src/browser/tree/tree-iterator.spec.ts index ec5f487164865..2208d45862468 100644 --- a/packages/core/src/browser/tree/tree-iterator.spec.ts +++ b/packages/core/src/browser/tree/tree-iterator.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/tree/tree-iterator.ts b/packages/core/src/browser/tree/tree-iterator.ts index fcc6074fee2f6..9102a4f4d953f 100644 --- a/packages/core/src/browser/tree/tree-iterator.ts +++ b/packages/core/src/browser/tree/tree-iterator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TreeNode, CompositeTreeNode } from './tree'; diff --git a/packages/core/src/browser/tree/tree-label-provider.ts b/packages/core/src/browser/tree/tree-label-provider.ts index e9281f0383925..9fcd658b33bc1 100644 --- a/packages/core/src/browser/tree/tree-label-provider.ts +++ b/packages/core/src/browser/tree/tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-model.ts b/packages/core/src/browser/tree/tree-model.ts index 4204de0d420dd..da808e5b2f0f7 100644 --- a/packages/core/src/browser/tree/tree-model.ts +++ b/packages/core/src/browser/tree/tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-navigation.ts b/packages/core/src/browser/tree/tree-navigation.ts index daa57bfcd659e..e9665032a7b74 100644 --- a/packages/core/src/browser/tree/tree-navigation.ts +++ b/packages/core/src/browser/tree/tree-navigation.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-search.ts b/packages/core/src/browser/tree/tree-search.ts index dfc9f9c6542c2..a6e5d9a657cf5 100644 --- a/packages/core/src/browser/tree/tree-search.ts +++ b/packages/core/src/browser/tree/tree-search.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-selection-impl.ts b/packages/core/src/browser/tree/tree-selection-impl.ts index 7b01ae4db69bc..4ba7ba263d8c8 100644 --- a/packages/core/src/browser/tree/tree-selection-impl.ts +++ b/packages/core/src/browser/tree/tree-selection-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree-selection-state.spec.ts b/packages/core/src/browser/tree/tree-selection-state.spec.ts index cc82c6c9110c6..2c6cc1576c61d 100644 --- a/packages/core/src/browser/tree/tree-selection-state.spec.ts +++ b/packages/core/src/browser/tree/tree-selection-state.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/browser/tree/tree-selection-state.ts b/packages/core/src/browser/tree/tree-selection-state.ts index 431e414db4099..ef9f92ae1a971 100644 --- a/packages/core/src/browser/tree/tree-selection-state.ts +++ b/packages/core/src/browser/tree/tree-selection-state.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Tree, TreeNode } from './tree'; diff --git a/packages/core/src/browser/tree/tree-selection.ts b/packages/core/src/browser/tree/tree-selection.ts index d7a8e2ebc2b5e..9f000bea94d89 100644 --- a/packages/core/src/browser/tree/tree-selection.ts +++ b/packages/core/src/browser/tree/tree-selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TreeNode } from './tree'; diff --git a/packages/core/src/browser/tree/tree-view-welcome-widget.tsx b/packages/core/src/browser/tree/tree-view-welcome-widget.tsx index 72bcad5c4f88d..f29ee29c235df 100644 --- a/packages/core/src/browser/tree/tree-view-welcome-widget.tsx +++ b/packages/core/src/browser/tree/tree-view-welcome-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/core/src/browser/tree/tree-widget-selection.ts b/packages/core/src/browser/tree/tree-widget-selection.ts index 7d40b10672c5a..4846f279c6d15 100644 --- a/packages/core/src/browser/tree/tree-widget-selection.ts +++ b/packages/core/src/browser/tree/tree-widget-selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TreeWidget } from './tree-widget'; diff --git a/packages/core/src/browser/tree/tree-widget.tsx b/packages/core/src/browser/tree/tree-widget.tsx index 5d10d5d2f6ce8..c242c3f4e220f 100644 --- a/packages/core/src/browser/tree/tree-widget.tsx +++ b/packages/core/src/browser/tree/tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/tree/tree.spec.ts b/packages/core/src/browser/tree/tree.spec.ts index b07e0317d14b0..f94f6d6cede26 100644 --- a/packages/core/src/browser/tree/tree.spec.ts +++ b/packages/core/src/browser/tree/tree.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/browser/tree/tree.ts b/packages/core/src/browser/tree/tree.ts index cbde1c57ea28e..8289639e41fb4 100644 --- a/packages/core/src/browser/tree/tree.ts +++ b/packages/core/src/browser/tree/tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/browser/user-working-directory-provider.ts b/packages/core/src/browser/user-working-directory-provider.ts index 8f20b76c1d842..002ed8e4bf475 100644 --- a/packages/core/src/browser/user-working-directory-provider.ts +++ b/packages/core/src/browser/user-working-directory-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/view-container.ts b/packages/core/src/browser/view-container.ts index f28514be1b691..30daef8321998 100644 --- a/packages/core/src/browser/view-container.ts +++ b/packages/core/src/browser/view-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/widget-decoration.ts b/packages/core/src/browser/widget-decoration.ts index ce247957ce217..6ddfd31f21d15 100644 --- a/packages/core/src/browser/widget-decoration.ts +++ b/packages/core/src/browser/widget-decoration.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/browser/widget-manager.spec.ts b/packages/core/src/browser/widget-manager.spec.ts index 6494212737f95..a8de2d9dffc13 100644 --- a/packages/core/src/browser/widget-manager.spec.ts +++ b/packages/core/src/browser/widget-manager.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from './test/jsdom'; diff --git a/packages/core/src/browser/widget-manager.ts b/packages/core/src/browser/widget-manager.ts index 2dda99f4b4cfe..56c1ba61e2dbb 100644 --- a/packages/core/src/browser/widget-manager.ts +++ b/packages/core/src/browser/widget-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, named, injectable } from 'inversify'; diff --git a/packages/core/src/browser/widget-open-handler.ts b/packages/core/src/browser/widget-open-handler.ts index 1d4554561f1a8..7c08ca1d02845 100644 --- a/packages/core/src/browser/widget-open-handler.ts +++ b/packages/core/src/browser/widget-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, postConstruct, injectable } from 'inversify'; diff --git a/packages/core/src/browser/widgets/alert-message.tsx b/packages/core/src/browser/widgets/alert-message.tsx index 4581687f82f2e..91df0b1e7002a 100644 --- a/packages/core/src/browser/widgets/alert-message.tsx +++ b/packages/core/src/browser/widgets/alert-message.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import React = require('react'); diff --git a/packages/core/src/browser/widgets/extractable-widget.ts b/packages/core/src/browser/widgets/extractable-widget.ts index 8a0ada5ce8f96..d5ae144348edb 100644 --- a/packages/core/src/browser/widgets/extractable-widget.ts +++ b/packages/core/src/browser/widgets/extractable-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget } from './widget'; diff --git a/packages/core/src/browser/widgets/index.ts b/packages/core/src/browser/widgets/index.ts index 429fd92d24130..a8539dea88602 100644 --- a/packages/core/src/browser/widgets/index.ts +++ b/packages/core/src/browser/widgets/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './widget'; diff --git a/packages/core/src/browser/widgets/react-renderer.tsx b/packages/core/src/browser/widgets/react-renderer.tsx index 6302b5bdadbce..f24325072ac13 100644 --- a/packages/core/src/browser/widgets/react-renderer.tsx +++ b/packages/core/src/browser/widgets/react-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from 'inversify'; diff --git a/packages/core/src/browser/widgets/react-widget.tsx b/packages/core/src/browser/widgets/react-widget.tsx index 7db0cf9908a45..b1b300be35588 100644 --- a/packages/core/src/browser/widgets/react-widget.tsx +++ b/packages/core/src/browser/widgets/react-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/widgets/select-component.tsx b/packages/core/src/browser/widgets/select-component.tsx index bc091d2279836..68bcdd22d325a 100644 --- a/packages/core/src/browser/widgets/select-component.tsx +++ b/packages/core/src/browser/widgets/select-component.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from 'react'; diff --git a/packages/core/src/browser/widgets/widget.ts b/packages/core/src/browser/widgets/widget.ts index d57ba6ac44511..f9afe9d6e77c5 100644 --- a/packages/core/src/browser/widgets/widget.ts +++ b/packages/core/src/browser/widgets/widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/browser/window-contribution.ts b/packages/core/src/browser/window-contribution.ts index 4b3ec6fe39dfa..9dcfd1be0d091 100644 --- a/packages/core/src/browser/window-contribution.ts +++ b/packages/core/src/browser/window-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/browser/window/browser-window-module.ts b/packages/core/src/browser/window/browser-window-module.ts index 29abfd81789d6..aa53023b6e778 100644 --- a/packages/core/src/browser/window/browser-window-module.ts +++ b/packages/core/src/browser/window/browser-window-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/browser/window/default-secondary-window-service.ts b/packages/core/src/browser/window/default-secondary-window-service.ts index 166d5b3de0ccf..7dc9745f52b34 100644 --- a/packages/core/src/browser/window/default-secondary-window-service.ts +++ b/packages/core/src/browser/window/default-secondary-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; import { SecondaryWindowService } from './secondary-window-service'; diff --git a/packages/core/src/browser/window/default-window-service.spec.ts b/packages/core/src/browser/window/default-window-service.spec.ts index e255a6e8add48..937f2edb85243 100644 --- a/packages/core/src/browser/window/default-window-service.spec.ts +++ b/packages/core/src/browser/window/default-window-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from 'inversify'; diff --git a/packages/core/src/browser/window/default-window-service.ts b/packages/core/src/browser/window/default-window-service.ts index bf659c068269d..7626a28261d07 100644 --- a/packages/core/src/browser/window/default-window-service.ts +++ b/packages/core/src/browser/window/default-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/browser/window/secondary-window-service.ts b/packages/core/src/browser/window/secondary-window-service.ts index 9f133ebc21b87..84e45cc9cfae8 100644 --- a/packages/core/src/browser/window/secondary-window-service.ts +++ b/packages/core/src/browser/window/secondary-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ApplicationShell } from '../shell'; diff --git a/packages/core/src/browser/window/test/mock-window-service.ts b/packages/core/src/browser/window/test/mock-window-service.ts index 9fe77f33663c9..3d924337b04a5 100644 --- a/packages/core/src/browser/window/test/mock-window-service.ts +++ b/packages/core/src/browser/window/test/mock-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; import { Event } from '../../../common/event'; diff --git a/packages/core/src/browser/window/window-service.ts b/packages/core/src/browser/window/window-service.ts index f1fbbfd9ce824..de04e6e7e333f 100644 --- a/packages/core/src/browser/window/window-service.ts +++ b/packages/core/src/browser/window/window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { StopReason } from '../../common/frontend-application-state'; diff --git a/packages/core/src/browser/window/window-title-service.ts b/packages/core/src/browser/window/window-title-service.ts index 175cb26520501..39c202fed0aae 100644 --- a/packages/core/src/browser/window/window-title-service.ts +++ b/packages/core/src/browser/window/window-title-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/browser/window/window-title-updater.ts b/packages/core/src/browser/window/window-title-updater.ts index a5e1e436f6d17..baa288632458e 100644 --- a/packages/core/src/browser/window/window-title-updater.ts +++ b/packages/core/src/browser/window/window-title-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget } from '../widgets'; diff --git a/packages/core/src/common/accessibility.ts b/packages/core/src/common/accessibility.ts index 1a01a4bbf8dbc..a630f92e7cbb3 100644 --- a/packages/core/src/common/accessibility.ts +++ b/packages/core/src/common/accessibility.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/application-error.spec.ts b/packages/core/src/common/application-error.spec.ts index c8b1aaa046aac..ff54968ea97a2 100644 --- a/packages/core/src/common/application-error.spec.ts +++ b/packages/core/src/common/application-error.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ApplicationError } from './application-error'; diff --git a/packages/core/src/common/application-error.ts b/packages/core/src/common/application-error.ts index 9527ef427df13..667da2e1099fd 100644 --- a/packages/core/src/common/application-error.ts +++ b/packages/core/src/common/application-error.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/application-protocol.ts b/packages/core/src/common/application-protocol.ts index cd638cf2f00d9..d84822c908d0a 100644 --- a/packages/core/src/common/application-protocol.ts +++ b/packages/core/src/common/application-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { OS } from './os'; diff --git a/packages/core/src/common/array-utils.ts b/packages/core/src/common/array-utils.ts index 259b3822bc7c9..c8781cef5ad3c 100644 --- a/packages/core/src/common/array-utils.ts +++ b/packages/core/src/common/array-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace ArrayUtils { diff --git a/packages/core/src/common/buffer.ts b/packages/core/src/common/buffer.ts index 28e57e2c1db3c..3e0ba7bf1c359 100644 --- a/packages/core/src/common/buffer.ts +++ b/packages/core/src/common/buffer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/common/cancellation.ts b/packages/core/src/common/cancellation.ts index 9474d5b03d424..82f7f86970a74 100644 --- a/packages/core/src/common/cancellation.ts +++ b/packages/core/src/common/cancellation.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation and others. All rights reserved. diff --git a/packages/core/src/common/char-code.ts b/packages/core/src/common/char-code.ts index 371b843b8f575..2715128992e16 100644 --- a/packages/core/src/common/char-code.ts +++ b/packages/core/src/common/char-code.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/Microsoft/vscode/blob/bf7ac9201e7a7d01741d4e6e64b5dc9f3197d97b/src/vs/base/common/charCode.ts diff --git a/packages/core/src/common/color.ts b/packages/core/src/common/color.ts index 9bb82ff139ac7..ec735da4eb45c 100644 --- a/packages/core/src/common/color.ts +++ b/packages/core/src/common/color.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/command.spec.ts b/packages/core/src/common/command.spec.ts index af8b13275e81c..580aa5ef5d784 100644 --- a/packages/core/src/common/command.spec.ts +++ b/packages/core/src/common/command.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandRegistry, CommandHandler, Command, CommandContribution } from './command'; diff --git a/packages/core/src/common/command.ts b/packages/core/src/common/command.ts index c29bb79975f5b..d0e3f6302095a 100644 --- a/packages/core/src/common/command.ts +++ b/packages/core/src/common/command.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/common/contribution-filter/contribution-filter-registry.ts b/packages/core/src/common/contribution-filter/contribution-filter-registry.ts index 8f7d8eb7444a6..829fb94c928b3 100644 --- a/packages/core/src/common/contribution-filter/contribution-filter-registry.ts +++ b/packages/core/src/common/contribution-filter/contribution-filter-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, multiInject, optional } from 'inversify'; diff --git a/packages/core/src/common/contribution-filter/contribution-filter.ts b/packages/core/src/common/contribution-filter/contribution-filter.ts index e7d145ff4df81..cf754310471e4 100644 --- a/packages/core/src/common/contribution-filter/contribution-filter.ts +++ b/packages/core/src/common/contribution-filter/contribution-filter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/common/contribution-filter/filter.ts b/packages/core/src/common/contribution-filter/filter.ts index b09fac84f84bd..7a15611017f89 100644 --- a/packages/core/src/common/contribution-filter/filter.ts +++ b/packages/core/src/common/contribution-filter/filter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const Filter = Symbol('Filter'); diff --git a/packages/core/src/common/contribution-filter/index.ts b/packages/core/src/common/contribution-filter/index.ts index 1beba3f16f6af..a03f24ef89046 100644 --- a/packages/core/src/common/contribution-filter/index.ts +++ b/packages/core/src/common/contribution-filter/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './contribution-filter'; diff --git a/packages/core/src/common/contribution-provider.ts b/packages/core/src/common/contribution-provider.ts index a70c59c857cf2..e49f144d2c9d4 100644 --- a/packages/core/src/common/contribution-provider.ts +++ b/packages/core/src/common/contribution-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/common/disposable.spec.ts b/packages/core/src/common/disposable.spec.ts index d9e3377c31cc1..0149c7adc27c4 100644 --- a/packages/core/src/common/disposable.spec.ts +++ b/packages/core/src/common/disposable.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/disposable.ts b/packages/core/src/common/disposable.ts index f9be424257f2d..1920343c9073e 100644 --- a/packages/core/src/common/disposable.ts +++ b/packages/core/src/common/disposable.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event, Emitter } from './event'; diff --git a/packages/core/src/common/encoding-service.ts b/packages/core/src/common/encoding-service.ts index 884b9b7fc6092..529298873d856 100644 --- a/packages/core/src/common/encoding-service.ts +++ b/packages/core/src/common/encoding-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/common/encodings.ts b/packages/core/src/common/encodings.ts index bb31f0d6f1de4..50fecb1aef067 100644 --- a/packages/core/src/common/encodings.ts +++ b/packages/core/src/common/encodings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const UTF8 = 'utf8'; diff --git a/packages/core/src/common/env-variables/env-variables-protocol.ts b/packages/core/src/common/env-variables/env-variables-protocol.ts index 2d7f3a4cbb24e..73d5a3f15e4ce 100644 --- a/packages/core/src/common/env-variables/env-variables-protocol.ts +++ b/packages/core/src/common/env-variables/env-variables-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const envVariablesPath = '/services/envs'; diff --git a/packages/core/src/common/env-variables/index.ts b/packages/core/src/common/env-variables/index.ts index a58c5f12ba05f..d13510f0ffb48 100644 --- a/packages/core/src/common/env-variables/index.ts +++ b/packages/core/src/common/env-variables/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './env-variables-protocol'; diff --git a/packages/core/src/common/event.spec.ts b/packages/core/src/common/event.spec.ts index e57672e1cc294..040c1bd0c9cd7 100644 --- a/packages/core/src/common/event.spec.ts +++ b/packages/core/src/common/event.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/event.ts b/packages/core/src/common/event.ts index ccb370f171e8f..80b57dba57a76 100644 --- a/packages/core/src/common/event.ts +++ b/packages/core/src/common/event.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/frontend-application-state.ts b/packages/core/src/common/frontend-application-state.ts index 02cd17c1cbfad..55feff9b32e4b 100644 --- a/packages/core/src/common/frontend-application-state.ts +++ b/packages/core/src/common/frontend-application-state.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export type FrontendApplicationState = diff --git a/packages/core/src/common/glob.ts b/packages/core/src/common/glob.ts index f62d51269c595..d32394ec90191 100644 --- a/packages/core/src/common/glob.ts +++ b/packages/core/src/common/glob.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/Microsoft/vscode/blob/bf7ac9201e7a7d01741d4e6e64b5dc9f3197d97b/src/vs/base/common/glob.ts /*--------------------------------------------------------------------------------------------- diff --git a/packages/core/src/common/i18n/localization.ts b/packages/core/src/common/i18n/localization.ts index 1dc9ffaef43c4..e33e7995f4377 100644 --- a/packages/core/src/common/i18n/localization.ts +++ b/packages/core/src/common/i18n/localization.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const localizationPath = '/services/i18n'; diff --git a/packages/core/src/common/index.ts b/packages/core/src/common/index.ts index a37d038c966d5..52de2157cf538 100644 --- a/packages/core/src/common/index.ts +++ b/packages/core/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export { environment } from '@theia/application-package/lib/environment'; diff --git a/packages/core/src/common/json-schema.ts b/packages/core/src/common/json-schema.ts index 0ab0215c27822..07885c0717a7d 100644 --- a/packages/core/src/common/json-schema.ts +++ b/packages/core/src/common/json-schema.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JSONValue } from '@phosphor/coreutils'; diff --git a/packages/core/src/common/keybinding.ts b/packages/core/src/common/keybinding.ts index cd0d373cb6bc3..9626ab3eefceb 100644 --- a/packages/core/src/common/keybinding.ts +++ b/packages/core/src/common/keybinding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from './types'; diff --git a/packages/core/src/common/keyboard/keyboard-layout-provider.ts b/packages/core/src/common/keyboard/keyboard-layout-provider.ts index 0f172d8f961f9..09ae10c71e883 100644 --- a/packages/core/src/common/keyboard/keyboard-layout-provider.ts +++ b/packages/core/src/common/keyboard/keyboard-layout-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import type { IKeyboardLayoutInfo, IKeyboardMapping } from 'native-keymap'; diff --git a/packages/core/src/common/keys.ts b/packages/core/src/common/keys.ts index e9d33ee3a423f..780304a37d1f7 100644 --- a/packages/core/src/common/keys.ts +++ b/packages/core/src/common/keys.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isOSX } from './os'; diff --git a/packages/core/src/common/keytar-protocol.ts b/packages/core/src/common/keytar-protocol.ts index d1368a0370340..9b491d55b0b81 100644 --- a/packages/core/src/common/keytar-protocol.ts +++ b/packages/core/src/common/keytar-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const keytarServicePath = '/services/keytar'; diff --git a/packages/core/src/common/label-protocol.ts b/packages/core/src/common/label-protocol.ts index b683563268392..b07b08fb8ec0b 100644 --- a/packages/core/src/common/label-protocol.ts +++ b/packages/core/src/common/label-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied and modified from https://github.com/microsoft/vscode/blob/1.44.2/src/vs/platform/label/common/label.ts#L35-L49 diff --git a/packages/core/src/common/logger-protocol.ts b/packages/core/src/common/logger-protocol.ts index 3d1da04e069ac..3b5b4b7cd2618 100644 --- a/packages/core/src/common/logger-protocol.ts +++ b/packages/core/src/common/logger-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/common/logger-watcher.ts b/packages/core/src/common/logger-watcher.ts index 9fcbbc8ac28f7..945c68d6cee54 100644 --- a/packages/core/src/common/logger-watcher.ts +++ b/packages/core/src/common/logger-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/common/logger.spec.ts b/packages/core/src/common/logger.spec.ts index 44e083464221d..5449e022cb9fc 100644 --- a/packages/core/src/common/logger.spec.ts +++ b/packages/core/src/common/logger.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/logger.ts b/packages/core/src/common/logger.ts index 6aae665f55b24..54900d53ac773 100644 --- a/packages/core/src/common/logger.ts +++ b/packages/core/src/common/logger.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/common/lsp-types.ts b/packages/core/src/common/lsp-types.ts index 0d7a322542fff..bbdcff7862de7 100644 --- a/packages/core/src/common/lsp-types.ts +++ b/packages/core/src/common/lsp-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Range } from 'vscode-languageserver-protocol'; diff --git a/packages/core/src/common/markdown-rendering/icon-utilities.ts b/packages/core/src/common/markdown-rendering/icon-utilities.ts index 272c94b4101ec..f5e4ac1cb98ab 100644 --- a/packages/core/src/common/markdown-rendering/icon-utilities.ts +++ b/packages/core/src/common/markdown-rendering/icon-utilities.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/common/codicons.ts diff --git a/packages/core/src/common/markdown-rendering/index.ts b/packages/core/src/common/markdown-rendering/index.ts index b27edbb1e5582..437012f7c13ae 100644 --- a/packages/core/src/common/markdown-rendering/index.ts +++ b/packages/core/src/common/markdown-rendering/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './markdown-string'; diff --git a/packages/core/src/common/markdown-rendering/markdown-string.ts b/packages/core/src/common/markdown-rendering/markdown-string.ts index 4a938ee35d2c4..a3ad46f42f11d 100644 --- a/packages/core/src/common/markdown-rendering/markdown-string.ts +++ b/packages/core/src/common/markdown-rendering/markdown-string.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { escapeRegExpCharacters } from '../strings'; diff --git a/packages/core/src/common/menu/action-menu-node.ts b/packages/core/src/common/menu/action-menu-node.ts index e51fad0a71d97..2da168d8c0da3 100644 --- a/packages/core/src/common/menu/action-menu-node.ts +++ b/packages/core/src/common/menu/action-menu-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandRegistry } from '../command'; diff --git a/packages/core/src/common/menu/composite-menu-node.ts b/packages/core/src/common/menu/composite-menu-node.ts index bf65e29f65be9..aad7208cf9c55 100644 --- a/packages/core/src/common/menu/composite-menu-node.ts +++ b/packages/core/src/common/menu/composite-menu-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '../disposable'; diff --git a/packages/core/src/common/menu/index.ts b/packages/core/src/common/menu/index.ts index aed34ac3c0374..5c8f8b438437d 100644 --- a/packages/core/src/common/menu/index.ts +++ b/packages/core/src/common/menu/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './action-menu-node'; diff --git a/packages/core/src/common/menu/menu-adapter.ts b/packages/core/src/common/menu/menu-adapter.ts index 1d62b10bb24ba..82c57b0648871 100644 --- a/packages/core/src/common/menu/menu-adapter.ts +++ b/packages/core/src/common/menu/menu-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/common/menu/menu-model-registry.ts b/packages/core/src/common/menu/menu-model-registry.ts index d1e3aba5c1607..6bbb5e1d3a450 100644 --- a/packages/core/src/common/menu/menu-model-registry.ts +++ b/packages/core/src/common/menu/menu-model-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/common/menu/menu-types.ts b/packages/core/src/common/menu/menu-types.ts index 82bd60733572f..6d2e8d6dc3bcb 100644 --- a/packages/core/src/common/menu/menu-types.ts +++ b/packages/core/src/common/menu/menu-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '../disposable'; diff --git a/packages/core/src/common/menu/menu.spec.ts b/packages/core/src/common/menu/menu.spec.ts index c4b2ad1888f6e..78b769c4d0da8 100644 --- a/packages/core/src/common/menu/menu.spec.ts +++ b/packages/core/src/common/menu/menu.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandContribution, CommandRegistry } from '../command'; diff --git a/packages/core/src/common/message-rpc/channel.spec.ts b/packages/core/src/common/message-rpc/channel.spec.ts index 43579ec957c6c..e3ddf78679914 100644 --- a/packages/core/src/common/message-rpc/channel.spec.ts +++ b/packages/core/src/common/message-rpc/channel.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { assert, expect, spy, use } from 'chai'; diff --git a/packages/core/src/common/message-rpc/channel.ts b/packages/core/src/common/message-rpc/channel.ts index 5cc433fbb68d0..05a9ba2426dfc 100644 --- a/packages/core/src/common/message-rpc/channel.ts +++ b/packages/core/src/common/message-rpc/channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, DisposableCollection } from '../disposable'; diff --git a/packages/core/src/common/message-rpc/index.ts b/packages/core/src/common/message-rpc/index.ts index 9dde128942026..86e7dfaa911d6 100644 --- a/packages/core/src/common/message-rpc/index.ts +++ b/packages/core/src/common/message-rpc/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export { AbstractChannel, Channel, ChannelCloseEvent, MessageProvider } from './channel'; export { ReadBuffer, WriteBuffer } from './message-buffer'; diff --git a/packages/core/src/common/message-rpc/message-buffer.ts b/packages/core/src/common/message-rpc/message-buffer.ts index 396ba95d93d73..d0b2fad0e351a 100644 --- a/packages/core/src/common/message-rpc/message-buffer.ts +++ b/packages/core/src/common/message-rpc/message-buffer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/message-rpc/msg-pack-extension-manager.ts b/packages/core/src/common/message-rpc/msg-pack-extension-manager.ts index 65df6981894f9..5844c1f684bfb 100644 --- a/packages/core/src/common/message-rpc/msg-pack-extension-manager.ts +++ b/packages/core/src/common/message-rpc/msg-pack-extension-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { addExtension } from 'msgpackr'; diff --git a/packages/core/src/common/message-rpc/rpc-message-encoder.spec.ts b/packages/core/src/common/message-rpc/rpc-message-encoder.spec.ts index 150c66c00fa71..e7236a9011b84 100644 --- a/packages/core/src/common/message-rpc/rpc-message-encoder.spec.ts +++ b/packages/core/src/common/message-rpc/rpc-message-encoder.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/message-rpc/rpc-message-encoder.ts b/packages/core/src/common/message-rpc/rpc-message-encoder.ts index dc68a34653e80..5b3785a4927c3 100644 --- a/packages/core/src/common/message-rpc/rpc-message-encoder.ts +++ b/packages/core/src/common/message-rpc/rpc-message-encoder.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/message-rpc/rpc-protocol.ts b/packages/core/src/common/message-rpc/rpc-protocol.ts index 4bcc08043f80f..672639b0c607b 100644 --- a/packages/core/src/common/message-rpc/rpc-protocol.ts +++ b/packages/core/src/common/message-rpc/rpc-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/message-rpc/uint8-array-message-buffer.spec.ts b/packages/core/src/common/message-rpc/uint8-array-message-buffer.spec.ts index 59cccbf90a605..181ff38b87c7d 100644 --- a/packages/core/src/common/message-rpc/uint8-array-message-buffer.spec.ts +++ b/packages/core/src/common/message-rpc/uint8-array-message-buffer.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from './uint8-array-message-buffer'; diff --git a/packages/core/src/common/message-rpc/uint8-array-message-buffer.ts b/packages/core/src/common/message-rpc/uint8-array-message-buffer.ts index feec31dcd69cf..5b4294b3d57aa 100644 --- a/packages/core/src/common/message-rpc/uint8-array-message-buffer.ts +++ b/packages/core/src/common/message-rpc/uint8-array-message-buffer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '../disposable'; import { Emitter, Event } from '../event'; diff --git a/packages/core/src/common/message-service-protocol.ts b/packages/core/src/common/message-service-protocol.ts index 07a66984ed68b..eb67c122217c4 100644 --- a/packages/core/src/common/message-service-protocol.ts +++ b/packages/core/src/common/message-service-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/common/message-service.ts b/packages/core/src/common/message-service.ts index 3c9d925397424..1ad7fc8086b31 100644 --- a/packages/core/src/common/message-service.ts +++ b/packages/core/src/common/message-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/common/messaging/abstract-connection-provider.ts b/packages/core/src/common/messaging/abstract-connection-provider.ts index 7709966b384b0..c7f41d99a76da 100644 --- a/packages/core/src/common/messaging/abstract-connection-provider.ts +++ b/packages/core/src/common/messaging/abstract-connection-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces } from 'inversify'; diff --git a/packages/core/src/common/messaging/connection-error-handler.ts b/packages/core/src/common/messaging/connection-error-handler.ts index 89a27b60a50db..928e49a4f8543 100644 --- a/packages/core/src/common/messaging/connection-error-handler.ts +++ b/packages/core/src/common/messaging/connection-error-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ILogger } from '../../common'; diff --git a/packages/core/src/common/messaging/handler.ts b/packages/core/src/common/messaging/handler.ts index 1e790d38aeec3..204125be8a203 100644 --- a/packages/core/src/common/messaging/handler.ts +++ b/packages/core/src/common/messaging/handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Channel } from '../message-rpc/channel'; diff --git a/packages/core/src/common/messaging/index.ts b/packages/core/src/common/messaging/index.ts index 34b87063db376..3a8a841f1f849 100644 --- a/packages/core/src/common/messaging/index.ts +++ b/packages/core/src/common/messaging/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './handler'; diff --git a/packages/core/src/common/messaging/proxy-factory.spec.ts b/packages/core/src/common/messaging/proxy-factory.spec.ts index 37280e4dbfdaa..dc7fa609633aa 100644 --- a/packages/core/src/common/messaging/proxy-factory.spec.ts +++ b/packages/core/src/common/messaging/proxy-factory.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/common/messaging/proxy-factory.ts b/packages/core/src/common/messaging/proxy-factory.ts index 7adb97f4b033a..ca1f6393009b7 100644 --- a/packages/core/src/common/messaging/proxy-factory.ts +++ b/packages/core/src/common/messaging/proxy-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/messaging/web-socket-channel.ts b/packages/core/src/common/messaging/web-socket-channel.ts index 65df8fe85fafe..4f98d5269fb32 100644 --- a/packages/core/src/common/messaging/web-socket-channel.ts +++ b/packages/core/src/common/messaging/web-socket-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/nls.ts b/packages/core/src/common/nls.ts index 72f55fb7aa4a2..0e87d49f9d691 100644 --- a/packages/core/src/common/nls.ts +++ b/packages/core/src/common/nls.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FormatType, Localization } from './i18n/localization'; diff --git a/packages/core/src/common/numbers.ts b/packages/core/src/common/numbers.ts index 2814b4d03c6ba..539e0247efbf4 100644 --- a/packages/core/src/common/numbers.ts +++ b/packages/core/src/common/numbers.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/objects.spec.ts b/packages/core/src/common/objects.spec.ts index 7d0579706a42d..2764f8bd28383 100644 --- a/packages/core/src/common/objects.spec.ts +++ b/packages/core/src/common/objects.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/objects.ts b/packages/core/src/common/objects.ts index a63fca5909040..f2b80f3e9afcb 100644 --- a/packages/core/src/common/objects.ts +++ b/packages/core/src/common/objects.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject, isUndefined } from './types'; diff --git a/packages/core/src/common/os.ts b/packages/core/src/common/os.ts index 2da5ec4cc3d11..a1a5942ddcbce 100644 --- a/packages/core/src/common/os.ts +++ b/packages/core/src/common/os.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** function is(userAgent: string, platform: string): boolean { diff --git a/packages/core/src/common/path.spec.ts b/packages/core/src/common/path.spec.ts index 0500a39472cfc..e00befe52b734 100644 --- a/packages/core/src/common/path.spec.ts +++ b/packages/core/src/common/path.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/common/path.ts b/packages/core/src/common/path.ts index 717778627f6e2..445361705d6a9 100644 --- a/packages/core/src/common/path.ts +++ b/packages/core/src/common/path.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/paths.ts b/packages/core/src/common/paths.ts index 93e61e341013a..285f41a382dca 100644 --- a/packages/core/src/common/paths.ts +++ b/packages/core/src/common/paths.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/Microsoft/vscode/blob/bf7ac9201e7a7d01741d4e6e64b5dc9f3197d97b/src/vs/base/common/paths.ts diff --git a/packages/core/src/common/performance/index.ts b/packages/core/src/common/performance/index.ts index 51c21fe73e841..3def00dda0dc9 100644 --- a/packages/core/src/common/performance/index.ts +++ b/packages/core/src/common/performance/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './measurement'; diff --git a/packages/core/src/common/performance/measurement-protocol.ts b/packages/core/src/common/performance/measurement-protocol.ts index a1f7a2524c968..f496d3848e91e 100644 --- a/packages/core/src/common/performance/measurement-protocol.ts +++ b/packages/core/src/common/performance/measurement-protocol.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/performance/measurement.ts b/packages/core/src/common/performance/measurement.ts index 87e5c4c8eb4d0..db3e547779459 100644 --- a/packages/core/src/common/performance/measurement.ts +++ b/packages/core/src/common/performance/measurement.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/performance/stopwatch.ts b/packages/core/src/common/performance/stopwatch.ts index 0d5936db485aa..4475bef57a78a 100644 --- a/packages/core/src/common/performance/stopwatch.ts +++ b/packages/core/src/common/performance/stopwatch.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/preferences/preference-schema.ts b/packages/core/src/common/preferences/preference-schema.ts index 5231c9eab41e9..3d1e15ca0411a 100644 --- a/packages/core/src/common/preferences/preference-schema.ts +++ b/packages/core/src/common/preferences/preference-schema.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/preferences/preference-scope.spec.ts b/packages/core/src/common/preferences/preference-scope.spec.ts index 06cc3c6fe0f39..4d564bed7f97e 100644 --- a/packages/core/src/common/preferences/preference-scope.spec.ts +++ b/packages/core/src/common/preferences/preference-scope.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/common/preferences/preference-scope.ts b/packages/core/src/common/preferences/preference-scope.ts index 6414033a1e72d..9c418eda9e207 100644 --- a/packages/core/src/common/preferences/preference-scope.ts +++ b/packages/core/src/common/preferences/preference-scope.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export enum PreferenceScope { diff --git a/packages/core/src/common/prioritizeable.ts b/packages/core/src/common/prioritizeable.ts index 122cc48e7d4b5..72bf84034ca69 100644 --- a/packages/core/src/common/prioritizeable.ts +++ b/packages/core/src/common/prioritizeable.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import type { MaybeArray, MaybePromise } from './types'; diff --git a/packages/core/src/common/progress-service-protocol.ts b/packages/core/src/common/progress-service-protocol.ts index 056226dde10b9..1589e0ff265d9 100644 --- a/packages/core/src/common/progress-service-protocol.ts +++ b/packages/core/src/common/progress-service-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/core/src/common/progress-service.ts b/packages/core/src/common/progress-service.ts index 7ac5363546e40..e425ace72c389 100644 --- a/packages/core/src/common/progress-service.ts +++ b/packages/core/src/common/progress-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/common/promise-util.spec.ts b/packages/core/src/common/promise-util.spec.ts index 5bb411f624eca..6324c86da2be6 100644 --- a/packages/core/src/common/promise-util.spec.ts +++ b/packages/core/src/common/promise-util.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; import { waitForEvent } from './promise-util'; diff --git a/packages/core/src/common/promise-util.ts b/packages/core/src/common/promise-util.ts index 3412b3c874cc9..f54362e13c8e5 100644 --- a/packages/core/src/common/promise-util.ts +++ b/packages/core/src/common/promise-util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from './disposable'; diff --git a/packages/core/src/common/quick-pick-service.ts b/packages/core/src/common/quick-pick-service.ts index 6d56e03e0d7ab..847e1b16de583 100644 --- a/packages/core/src/common/quick-pick-service.ts +++ b/packages/core/src/common/quick-pick-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from './uri'; @@ -217,7 +217,7 @@ export interface InputOptions { placeHolder?: string; password?: boolean; ignoreFocusLost?: boolean; - validateInput?(input: string): Promise | undefined; + validateInput?(input: string): Promise | undefined; } export interface QuickPickItemButtonEvent { diff --git a/packages/core/src/common/reference.spec.ts b/packages/core/src/common/reference.spec.ts index bf6e7cb7325bc..64901fcedff95 100644 --- a/packages/core/src/common/reference.spec.ts +++ b/packages/core/src/common/reference.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/common/reference.ts b/packages/core/src/common/reference.ts index dac2bf43f1530..f8a77ec4f0b3a 100644 --- a/packages/core/src/common/reference.ts +++ b/packages/core/src/common/reference.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, DisposableCollection } from './disposable'; diff --git a/packages/core/src/common/resource.ts b/packages/core/src/common/resource.ts index 4f0586a2e8935..4c62063e94478 100644 --- a/packages/core/src/common/resource.ts +++ b/packages/core/src/common/resource.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from 'inversify'; diff --git a/packages/core/src/common/selection-command-handler.ts b/packages/core/src/common/selection-command-handler.ts index d1dddf2abd46c..3e32a33928cca 100644 --- a/packages/core/src/common/selection-command-handler.ts +++ b/packages/core/src/common/selection-command-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/selection-service.spec.ts b/packages/core/src/common/selection-service.spec.ts index 5c7eab43b1a8e..ceea20b06b20e 100644 --- a/packages/core/src/common/selection-service.spec.ts +++ b/packages/core/src/common/selection-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SelectionService } from './selection-service'; diff --git a/packages/core/src/common/selection-service.ts b/packages/core/src/common/selection-service.ts index 28b99ec53eb13..feeba3dc9c6c7 100644 --- a/packages/core/src/common/selection-service.ts +++ b/packages/core/src/common/selection-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/selection.ts b/packages/core/src/common/selection.ts index 5b1970fccbc7b..6f5e8bb503bff 100644 --- a/packages/core/src/common/selection.ts +++ b/packages/core/src/common/selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from './types'; diff --git a/packages/core/src/common/severity.ts b/packages/core/src/common/severity.ts index 1555c1d2861de..43f001df1e736 100644 --- a/packages/core/src/common/severity.ts +++ b/packages/core/src/common/severity.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/core/src/common/stream.ts b/packages/core/src/common/stream.ts index c50441c17bdbb..68ab95e363981 100644 --- a/packages/core/src/common/stream.ts +++ b/packages/core/src/common/stream.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/common/strings.ts b/packages/core/src/common/strings.ts index 7453e58899e0c..2051966b7f3fa 100644 --- a/packages/core/src/common/strings.ts +++ b/packages/core/src/common/strings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/common/telemetry.ts b/packages/core/src/common/telemetry.ts index 3b143957fc280..698707e4e2aec 100644 --- a/packages/core/src/common/telemetry.ts +++ b/packages/core/src/common/telemetry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export class TelemetryTrustedValue { diff --git a/packages/core/src/common/ternary-search-tree.ts b/packages/core/src/common/ternary-search-tree.ts index 8cdc7759ebc7f..8953206240790 100644 --- a/packages/core/src/common/ternary-search-tree.ts +++ b/packages/core/src/common/ternary-search-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/core/src/common/test/expect.ts b/packages/core/src/common/test/expect.ts index 52fd26fb26806..5a3268ad53046 100644 --- a/packages/core/src/common/test/expect.ts +++ b/packages/core/src/common/test/expect.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line import/no-extraneous-dependencies diff --git a/packages/core/src/common/test/mock-logger.ts b/packages/core/src/common/test/mock-logger.ts index e6acf2d3a921b..cc2bf04efbf78 100644 --- a/packages/core/src/common/test/mock-logger.ts +++ b/packages/core/src/common/test/mock-logger.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/test/mock-menu.ts b/packages/core/src/common/test/mock-menu.ts index 6577e0caa195f..8cdfc4727feb7 100644 --- a/packages/core/src/common/test/mock-menu.ts +++ b/packages/core/src/common/test/mock-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '../disposable'; diff --git a/packages/core/src/common/test/mock-resource-provider.ts b/packages/core/src/common/test/mock-resource-provider.ts index 0b32f4c861bea..deeeb8406bb0b 100644 --- a/packages/core/src/common/test/mock-resource-provider.ts +++ b/packages/core/src/common/test/mock-resource-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/common/theme.ts b/packages/core/src/common/theme.ts index adc7c49cf870a..e6b5e737c8e16 100644 --- a/packages/core/src/common/theme.ts +++ b/packages/core/src/common/theme.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export type ThemeType = 'light' | 'dark' | 'hc' | 'hcLight'; diff --git a/packages/core/src/common/types.spec.ts b/packages/core/src/common/types.spec.ts index 0f493e5332b7b..5dc51f13ee78b 100644 --- a/packages/core/src/common/types.spec.ts +++ b/packages/core/src/common/types.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/core/src/common/types.ts b/packages/core/src/common/types.ts index 6fc5a93d326fe..e5c7bb26462c5 100644 --- a/packages/core/src/common/types.ts +++ b/packages/core/src/common/types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export { ArrayUtils } from './array-utils'; diff --git a/packages/core/src/common/uri-command-handler.spec.ts b/packages/core/src/common/uri-command-handler.spec.ts index df1be4e9b0917..944d430941352 100644 --- a/packages/core/src/common/uri-command-handler.spec.ts +++ b/packages/core/src/common/uri-command-handler.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/common/uri-command-handler.ts b/packages/core/src/common/uri-command-handler.ts index a3e23eb4e1fca..9efcdfbe7b256 100644 --- a/packages/core/src/common/uri-command-handler.ts +++ b/packages/core/src/common/uri-command-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/common/uri.spec.ts b/packages/core/src/common/uri.spec.ts index 6a73ff9c062b8..d94aa7b978c6d 100644 --- a/packages/core/src/common/uri.spec.ts +++ b/packages/core/src/common/uri.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/common/uri.ts b/packages/core/src/common/uri.ts index 104717e2ba325..fe24bc2e54339 100644 --- a/packages/core/src/common/uri.ts +++ b/packages/core/src/common/uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI as Uri } from 'vscode-uri'; diff --git a/packages/core/src/common/view-column.ts b/packages/core/src/common/view-column.ts index 0548370518db3..e612fd5ef4f6d 100644 --- a/packages/core/src/common/view-column.ts +++ b/packages/core/src/common/view-column.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/common/window.ts b/packages/core/src/common/window.ts index b21fa620f7076..f4606c9d43ddc 100644 --- a/packages/core/src/common/window.ts +++ b/packages/core/src/common/window.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/electron-browser/electron-clipboard-service.ts b/packages/core/src/electron-browser/electron-clipboard-service.ts index 79e5c728db7f1..8a8c3c4df326e 100644 --- a/packages/core/src/electron-browser/electron-clipboard-service.ts +++ b/packages/core/src/electron-browser/electron-clipboard-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line import/no-extraneous-dependencies diff --git a/packages/core/src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts b/packages/core/src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts index 069f05f98934a..bdd88dba03741 100644 --- a/packages/core/src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts +++ b/packages/core/src/electron-browser/keyboard/electron-keyboard-layout-change-notifier.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { postConstruct, injectable } from 'inversify'; diff --git a/packages/core/src/electron-browser/keyboard/electron-keyboard-module.ts b/packages/core/src/electron-browser/keyboard/electron-keyboard-module.ts index 3d2dfd32befda..f7168521cbaef 100644 --- a/packages/core/src/electron-browser/keyboard/electron-keyboard-module.ts +++ b/packages/core/src/electron-browser/keyboard/electron-keyboard-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts b/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts index 85c208182a8f4..4509570645d44 100644 --- a/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts +++ b/packages/core/src/electron-browser/menu/electron-context-menu-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts b/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts index 8daa324cd4989..4ff411d93c48d 100644 --- a/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts +++ b/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/electron-browser/menu/electron-menu-contribution.ts b/packages/core/src/electron-browser/menu/electron-menu-contribution.ts index 23719b754e5c4..30a997fc70ce0 100644 --- a/packages/core/src/electron-browser/menu/electron-menu-contribution.ts +++ b/packages/core/src/electron-browser/menu/electron-menu-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/electron-browser/menu/electron-menu-module.ts b/packages/core/src/electron-browser/menu/electron-menu-module.ts index 063a43e841eb7..e97022339ac68 100644 --- a/packages/core/src/electron-browser/menu/electron-menu-module.ts +++ b/packages/core/src/electron-browser/menu/electron-menu-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/menu/electron-menu-style.css b/packages/core/src/electron-browser/menu/electron-menu-style.css index 7ab4279573883..39535e39cb4e4 100644 --- a/packages/core/src/electron-browser/menu/electron-menu-style.css +++ b/packages/core/src/electron-browser/menu/electron-menu-style.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #theia-drag-panel { @@ -76,7 +76,8 @@ grid-column: 1; } -#maximize-button, #restore-button { +#maximize-button, +#restore-button { grid-column: 2; } @@ -93,7 +94,7 @@ } #window-controls #close-button:hover { - background: #E81123; + background: #e81123; } #window-controls #close-button:hover:before { diff --git a/packages/core/src/electron-browser/messaging/electron-ipc-connection-provider.ts b/packages/core/src/electron-browser/messaging/electron-ipc-connection-provider.ts index b5eb8f930c3f8..943e5fad28e89 100644 --- a/packages/core/src/electron-browser/messaging/electron-ipc-connection-provider.ts +++ b/packages/core/src/electron-browser/messaging/electron-ipc-connection-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces } from 'inversify'; diff --git a/packages/core/src/electron-browser/messaging/electron-messaging-frontend-module.ts b/packages/core/src/electron-browser/messaging/electron-messaging-frontend-module.ts index 52d9e05a2e882..ed7432d2eddcd 100644 --- a/packages/core/src/electron-browser/messaging/electron-messaging-frontend-module.ts +++ b/packages/core/src/electron-browser/messaging/electron-messaging-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/messaging/electron-ws-connection-provider.ts b/packages/core/src/electron-browser/messaging/electron-ws-connection-provider.ts index f5a5fd6e90cd5..c83858d905005 100644 --- a/packages/core/src/electron-browser/messaging/electron-ws-connection-provider.ts +++ b/packages/core/src/electron-browser/messaging/electron-ws-connection-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/electron-browser/preload.ts b/packages/core/src/electron-browser/preload.ts index fbae86bffefec..829e66c55c97f 100644 --- a/packages/core/src/electron-browser/preload.ts +++ b/packages/core/src/electron-browser/preload.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // import { IpcRendererEvent } from '@theia/electron/shared/electron'; import { Disposable } from '../common/disposable'; diff --git a/packages/core/src/electron-browser/request/electron-browser-request-module.ts b/packages/core/src/electron-browser/request/electron-browser-request-module.ts index d64de16afbd06..48bad3b2cdd7d 100644 --- a/packages/core/src/electron-browser/request/electron-browser-request-module.ts +++ b/packages/core/src/electron-browser/request/electron-browser-request-module.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/token/electron-token-frontend-module.ts b/packages/core/src/electron-browser/token/electron-token-frontend-module.ts index 3dd4e1db83367..c282eb7582ecb 100644 --- a/packages/core/src/electron-browser/token/electron-token-frontend-module.ts +++ b/packages/core/src/electron-browser/token/electron-token-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/window/electron-frontend-application-state.ts b/packages/core/src/electron-browser/window/electron-frontend-application-state.ts index d56e80076481e..c7b6d127d2c0c 100644 --- a/packages/core/src/electron-browser/window/electron-frontend-application-state.ts +++ b/packages/core/src/electron-browser/window/electron-frontend-application-state.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/electron-browser/window/electron-secondary-window-service.ts b/packages/core/src/electron-browser/window/electron-secondary-window-service.ts index ea95749c45f5c..bcaae900e9915 100644 --- a/packages/core/src/electron-browser/window/electron-secondary-window-service.ts +++ b/packages/core/src/electron-browser/window/electron-secondary-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/electron-browser/window/electron-window-module.ts b/packages/core/src/electron-browser/window/electron-window-module.ts index 717d51aa7f60d..3c88d122b2bd4 100644 --- a/packages/core/src/electron-browser/window/electron-window-module.ts +++ b/packages/core/src/electron-browser/window/electron-window-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-browser/window/electron-window-preferences.ts b/packages/core/src/electron-browser/window/electron-window-preferences.ts index 84ee5ae28271e..b0c18785a617e 100644 --- a/packages/core/src/electron-browser/window/electron-window-preferences.ts +++ b/packages/core/src/electron-browser/window/electron-window-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from 'inversify'; diff --git a/packages/core/src/electron-browser/window/electron-window-service.ts b/packages/core/src/electron-browser/window/electron-window-service.ts index b61a1c771914b..9ddab4469887d 100644 --- a/packages/core/src/electron-browser/window/electron-window-service.ts +++ b/packages/core/src/electron-browser/window/electron-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from 'inversify'; diff --git a/packages/core/src/electron-common/electron-api.ts b/packages/core/src/electron-common/electron-api.ts index f34cf7fbc2a2b..ac6e991cf6da8 100644 --- a/packages/core/src/electron-common/electron-api.ts +++ b/packages/core/src/electron-common/electron-api.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { NativeKeyboardLayout } from '../common/keyboard/keyboard-layout-provider'; diff --git a/packages/core/src/electron-common/electron-main-window-service.ts b/packages/core/src/electron-common/electron-main-window-service.ts index 310e4be2f6080..9f739631fd84b 100644 --- a/packages/core/src/electron-common/electron-main-window-service.ts +++ b/packages/core/src/electron-common/electron-main-window-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { NewWindowOptions } from '../common/window'; diff --git a/packages/core/src/electron-common/electron-token.ts b/packages/core/src/electron-common/electron-token.ts index 4b6ddec605abf..2455d3591d2c8 100644 --- a/packages/core/src/electron-common/electron-token.ts +++ b/packages/core/src/electron-common/electron-token.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/electron-common/messaging/electron-connection-handler.ts b/packages/core/src/electron-common/messaging/electron-connection-handler.ts index f42791b93bf50..17fed86893391 100644 --- a/packages/core/src/electron-common/messaging/electron-connection-handler.ts +++ b/packages/core/src/electron-common/messaging/electron-connection-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/core/src/electron-main/electron-api-main.ts b/packages/core/src/electron-main/electron-api-main.ts index 37b3e0a037ad7..6e1d469276ee0 100644 --- a/packages/core/src/electron-main/electron-api-main.ts +++ b/packages/core/src/electron-main/electron-api-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/core/src/electron-main/electron-main-application-module.ts b/packages/core/src/electron-main/electron-main-application-module.ts index 02751d73c336d..8d2214bda8ada 100644 --- a/packages/core/src/electron-main/electron-main-application-module.ts +++ b/packages/core/src/electron-main/electron-main-application-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-main/electron-main-application.ts b/packages/core/src/electron-main/electron-main-application.ts index ec49244cd5ad7..4e19a48eef768 100644 --- a/packages/core/src/electron-main/electron-main-application.ts +++ b/packages/core/src/electron-main/electron-main-application.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/electron-main/electron-main-constants.ts b/packages/core/src/electron-main/electron-main-constants.ts index ddd83375ef449..e235ee354a50a 100644 --- a/packages/core/src/electron-main/electron-main-constants.ts +++ b/packages/core/src/electron-main/electron-main-constants.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const ElectronMainApplicationGlobals = Symbol('ElectronMainApplicationGlobals'); diff --git a/packages/core/src/electron-main/electron-main-window-service-impl.ts b/packages/core/src/electron-main/electron-main-window-service-impl.ts index c1cbac81ad0fa..6a7dcb5c19f37 100644 --- a/packages/core/src/electron-main/electron-main-window-service-impl.ts +++ b/packages/core/src/electron-main/electron-main-window-service-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { shell } from '@theia/electron/shared/electron'; diff --git a/packages/core/src/electron-main/electron-security-token-service.ts b/packages/core/src/electron-main/electron-security-token-service.ts index ad4c6d2164674..3f10a54d768c8 100644 --- a/packages/core/src/electron-main/electron-security-token-service.ts +++ b/packages/core/src/electron-main/electron-security-token-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { session } from '@theia/electron/shared/electron'; diff --git a/packages/core/src/electron-main/event-utils.ts b/packages/core/src/electron-main/event-utils.ts index fd6a7914c4072..4a59e09408019 100644 --- a/packages/core/src/electron-main/event-utils.ts +++ b/packages/core/src/electron-main/event-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, DisposableCollection } from '../common'; diff --git a/packages/core/src/electron-main/messaging/electron-messaging-contribution.ts b/packages/core/src/electron-main/messaging/electron-messaging-contribution.ts index 69f89add71132..421d5d01497ad 100644 --- a/packages/core/src/electron-main/messaging/electron-messaging-contribution.ts +++ b/packages/core/src/electron-main/messaging/electron-messaging-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { WebContents } from '@theia/electron/shared/electron'; diff --git a/packages/core/src/electron-main/messaging/electron-messaging-service.ts b/packages/core/src/electron-main/messaging/electron-messaging-service.ts index 874d51237b4fd..d2f5aab7c086f 100644 --- a/packages/core/src/electron-main/messaging/electron-messaging-service.ts +++ b/packages/core/src/electron-main/messaging/electron-messaging-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Channel } from '../../common/message-rpc/channel'; diff --git a/packages/core/src/electron-main/theia-electron-window.ts b/packages/core/src/electron-main/theia-electron-window.ts index 07abf5592d548..5c473ffdab2f6 100644 --- a/packages/core/src/electron-main/theia-electron-window.ts +++ b/packages/core/src/electron-main/theia-electron-window.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationConfig } from '@theia/application-package'; diff --git a/packages/core/src/electron-node/hosting/electron-backend-hosting-module.ts b/packages/core/src/electron-node/hosting/electron-backend-hosting-module.ts index d4d04dd56b67e..2db558d589205 100644 --- a/packages/core/src/electron-node/hosting/electron-backend-hosting-module.ts +++ b/packages/core/src/electron-node/hosting/electron-backend-hosting-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-node/hosting/electron-ws-origin-validator.ts b/packages/core/src/electron-node/hosting/electron-ws-origin-validator.ts index 9bd2c4d071e37..d725249824085 100644 --- a/packages/core/src/electron-node/hosting/electron-ws-origin-validator.ts +++ b/packages/core/src/electron-node/hosting/electron-ws-origin-validator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/electron-node/keyboard/electron-backend-keyboard-module.ts b/packages/core/src/electron-node/keyboard/electron-backend-keyboard-module.ts index 68cfee9f42526..3110578a244cc 100644 --- a/packages/core/src/electron-node/keyboard/electron-backend-keyboard-module.ts +++ b/packages/core/src/electron-node/keyboard/electron-backend-keyboard-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-node/keyboard/electron-keyboard-layout-provider.ts b/packages/core/src/electron-node/keyboard/electron-keyboard-layout-provider.ts index aecb01b1ae80a..0ea9d60452615 100644 --- a/packages/core/src/electron-node/keyboard/electron-keyboard-layout-provider.ts +++ b/packages/core/src/electron-node/keyboard/electron-keyboard-layout-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as nativeKeymap from '@theia/electron/shared/native-keymap'; diff --git a/packages/core/src/electron-node/request/electron-backend-request-module.ts b/packages/core/src/electron-node/request/electron-backend-request-module.ts index fce38d11cbeaa..0dc3a2e8be1f6 100644 --- a/packages/core/src/electron-node/request/electron-backend-request-module.ts +++ b/packages/core/src/electron-node/request/electron-backend-request-module.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-node/request/electron-backend-request-service.ts b/packages/core/src/electron-node/request/electron-backend-request-service.ts index c34975751978e..bdb81659c8e96 100644 --- a/packages/core/src/electron-node/request/electron-backend-request-service.ts +++ b/packages/core/src/electron-node/request/electron-backend-request-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { decorate, injectable } from 'inversify'; diff --git a/packages/core/src/electron-node/token/electron-token-backend-contribution.ts b/packages/core/src/electron-node/token/electron-token-backend-contribution.ts index 8f36775520907..f817c7c717016 100644 --- a/packages/core/src/electron-node/token/electron-token-backend-contribution.ts +++ b/packages/core/src/electron-node/token/electron-token-backend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import express = require('express'); diff --git a/packages/core/src/electron-node/token/electron-token-backend-module.ts b/packages/core/src/electron-node/token/electron-token-backend-module.ts index bd50bb4087360..7fa168e198b38 100644 --- a/packages/core/src/electron-node/token/electron-token-backend-module.ts +++ b/packages/core/src/electron-node/token/electron-token-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/electron-node/token/electron-token-messaging-contribution.ts b/packages/core/src/electron-node/token/electron-token-messaging-contribution.ts index 7d32f64c35c7e..631ba2c99a2c6 100644 --- a/packages/core/src/electron-node/token/electron-token-messaging-contribution.ts +++ b/packages/core/src/electron-node/token/electron-token-messaging-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/electron-node/token/electron-token-validator.ts b/packages/core/src/electron-node/token/electron-token-validator.ts index 2504306c49bf9..02f3debc19808 100644 --- a/packages/core/src/electron-node/token/electron-token-validator.ts +++ b/packages/core/src/electron-node/token/electron-token-validator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/node/application-server.ts b/packages/core/src/node/application-server.ts index 3ea46c718b480..011f90db35e60 100644 --- a/packages/core/src/node/application-server.ts +++ b/packages/core/src/node/application-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from 'inversify'; diff --git a/packages/core/src/node/backend-application-config-provider.spec.ts b/packages/core/src/node/backend-application-config-provider.spec.ts index 5eca8eee120c2..207fdb1a66437 100644 --- a/packages/core/src/node/backend-application-config-provider.spec.ts +++ b/packages/core/src/node/backend-application-config-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BackendApplicationConfig } from '@theia/application-package/lib/'; diff --git a/packages/core/src/node/backend-application-config-provider.ts b/packages/core/src/node/backend-application-config-provider.ts index 720d7ae55857a..822a61036ea04 100644 --- a/packages/core/src/node/backend-application-config-provider.ts +++ b/packages/core/src/node/backend-application-config-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BackendApplicationConfig, deepmerge } from '@theia/application-package/lib/application-props'; diff --git a/packages/core/src/node/backend-application-module.ts b/packages/core/src/node/backend-application-module.ts index 40dff58c0b1d5..339a2b58d380c 100644 --- a/packages/core/src/node/backend-application-module.ts +++ b/packages/core/src/node/backend-application-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, decorate, injectable } from 'inversify'; diff --git a/packages/core/src/node/backend-application.ts b/packages/core/src/node/backend-application.ts index 4547ce4d97d63..702f2c59396de 100644 --- a/packages/core/src/node/backend-application.ts +++ b/packages/core/src/node/backend-application.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/core/src/node/cli.spec.ts b/packages/core/src/node/cli.spec.ts index 4cc766b4349ad..c24926c23f113 100644 --- a/packages/core/src/node/cli.spec.ts +++ b/packages/core/src/node/cli.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as yargs from 'yargs'; diff --git a/packages/core/src/node/cli.ts b/packages/core/src/node/cli.ts index a9d7e6dd4bbd9..7985594f66fdc 100644 --- a/packages/core/src/node/cli.ts +++ b/packages/core/src/node/cli.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as yargs from 'yargs'; diff --git a/packages/core/src/node/console-logger-server.spec.ts b/packages/core/src/node/console-logger-server.spec.ts index af8c126da4e7e..3a77ff51244b9 100644 --- a/packages/core/src/node/console-logger-server.spec.ts +++ b/packages/core/src/node/console-logger-server.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/node/console-logger-server.ts b/packages/core/src/node/console-logger-server.ts index c3bdaf96f2b9d..a8068c29c6f69 100644 --- a/packages/core/src/node/console-logger-server.ts +++ b/packages/core/src/node/console-logger-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/node/debug.ts b/packages/core/src/node/debug.ts index 325c93c5116fb..b9aff69cccb9b 100644 --- a/packages/core/src/node/debug.ts +++ b/packages/core/src/node/debug.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line no-var, @typescript-eslint/no-explicit-any diff --git a/packages/core/src/node/dynamic-require.ts b/packages/core/src/node/dynamic-require.ts index f3ecc3d2d023f..b180c6c4aa688 100644 --- a/packages/core/src/node/dynamic-require.ts +++ b/packages/core/src/node/dynamic-require.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/packages/core/src/node/env-variables/env-variables-server.ts b/packages/core/src/node/env-variables/env-variables-server.ts index 37e3aef26e947..8b17d25c526b9 100644 --- a/packages/core/src/node/env-variables/env-variables-server.ts +++ b/packages/core/src/node/env-variables/env-variables-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { join } from 'path'; diff --git a/packages/core/src/node/env-variables/index.ts b/packages/core/src/node/env-variables/index.ts index eff507b14f952..784072f28d15c 100644 --- a/packages/core/src/node/env-variables/index.ts +++ b/packages/core/src/node/env-variables/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './env-variables-server'; diff --git a/packages/core/src/node/environment-utils.spec.ts b/packages/core/src/node/environment-utils.spec.ts index deb9dde9f6956..15ecf42abf224 100644 --- a/packages/core/src/node/environment-utils.spec.ts +++ b/packages/core/src/node/environment-utils.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/core/src/node/environment-utils.ts b/packages/core/src/node/environment-utils.ts index 996d3e752642b..2e6db6189661b 100644 --- a/packages/core/src/node/environment-utils.ts +++ b/packages/core/src/node/environment-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/node/file-uri.spec.ts b/packages/core/src/node/file-uri.spec.ts index 9f92ad52735ca..378fe71edfc99 100644 --- a/packages/core/src/node/file-uri.spec.ts +++ b/packages/core/src/node/file-uri.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as os from 'os'; diff --git a/packages/core/src/node/file-uri.ts b/packages/core/src/node/file-uri.ts index 7d1e53dace5ea..99a86fbb7b5ca 100644 --- a/packages/core/src/node/file-uri.ts +++ b/packages/core/src/node/file-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI as Uri } from 'vscode-uri'; diff --git a/packages/core/src/node/filesystem-locking.ts b/packages/core/src/node/filesystem-locking.ts index df62329d19135..fe10f41cf862c 100644 --- a/packages/core/src/node/filesystem-locking.ts +++ b/packages/core/src/node/filesystem-locking.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Mutex } from 'async-mutex'; diff --git a/packages/core/src/node/hosting/backend-application-hosts.ts b/packages/core/src/node/hosting/backend-application-hosts.ts index 516ecbc197db5..2596e4fc92ecc 100644 --- a/packages/core/src/node/hosting/backend-application-hosts.ts +++ b/packages/core/src/node/hosting/backend-application-hosts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct } from 'inversify'; diff --git a/packages/core/src/node/hosting/backend-hosting-module.ts b/packages/core/src/node/hosting/backend-hosting-module.ts index 53f06ab35d7dc..c2f1dd5ce4b0e 100644 --- a/packages/core/src/node/hosting/backend-hosting-module.ts +++ b/packages/core/src/node/hosting/backend-hosting-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/node/hosting/ws-origin-validator.ts b/packages/core/src/node/hosting/ws-origin-validator.ts index b14bc9adf2b94..e590e07651dc6 100644 --- a/packages/core/src/node/hosting/ws-origin-validator.ts +++ b/packages/core/src/node/hosting/ws-origin-validator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/node/i18n/i18n-backend-module.ts b/packages/core/src/node/i18n/i18n-backend-module.ts index 296314a1cd7b6..2b5cfc03128b6 100644 --- a/packages/core/src/node/i18n/i18n-backend-module.ts +++ b/packages/core/src/node/i18n/i18n-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/node/i18n/localization-backend-contribution.ts b/packages/core/src/node/i18n/localization-backend-contribution.ts index d4eb5fa36491b..e7744560336f9 100644 --- a/packages/core/src/node/i18n/localization-backend-contribution.ts +++ b/packages/core/src/node/i18n/localization-backend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as express from 'express'; diff --git a/packages/core/src/node/i18n/localization-contribution.ts b/packages/core/src/node/i18n/localization-contribution.ts index 9610d5c7a2786..2fd8815d04ce4 100644 --- a/packages/core/src/node/i18n/localization-contribution.ts +++ b/packages/core/src/node/i18n/localization-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from 'fs-extra'; diff --git a/packages/core/src/node/i18n/localization-provider.ts b/packages/core/src/node/i18n/localization-provider.ts index 647e44d293c96..0ceab71867c36 100644 --- a/packages/core/src/node/i18n/localization-provider.ts +++ b/packages/core/src/node/i18n/localization-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/node/i18n/theia-localization-contribution.ts b/packages/core/src/node/i18n/theia-localization-contribution.ts index 9746b94715593..4f6ad11db6a9c 100644 --- a/packages/core/src/node/i18n/theia-localization-contribution.ts +++ b/packages/core/src/node/i18n/theia-localization-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from 'inversify'; diff --git a/packages/core/src/node/index.ts b/packages/core/src/node/index.ts index 03993f8a2890e..192f8089d99de 100644 --- a/packages/core/src/node/index.ts +++ b/packages/core/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './backend-application'; diff --git a/packages/core/src/node/keytar-server.ts b/packages/core/src/node/keytar-server.ts index 51cd7d392df1b..bcec832768957 100644 --- a/packages/core/src/node/keytar-server.ts +++ b/packages/core/src/node/keytar-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/core/src/node/logger-backend-module.ts b/packages/core/src/node/logger-backend-module.ts index 98137226d4b66..54286dffafcc7 100644 --- a/packages/core/src/node/logger-backend-module.ts +++ b/packages/core/src/node/logger-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, Container, interfaces } from 'inversify'; @@ -54,11 +54,11 @@ export function bindLogger(bind: interfaces.Bind, props?: { */ export const loggerBackendModule = new ContainerModule(bind => { bind(BackendApplicationContribution).toDynamicValue(ctx => - ({ - initialize(): void { - setRootLogger(ctx.container.get(ILogger)); - } - })); + ({ + initialize(): void { + setRootLogger(ctx.container.get(ILogger)); + } + })); bind(DispatchingLoggerClient).toSelf().inSingletonScope(); bindLogger(bind, { diff --git a/packages/core/src/node/logger-cli-contribution.spec.ts b/packages/core/src/node/logger-cli-contribution.spec.ts index 7cc3b396a66e7..204bd51104ef2 100644 --- a/packages/core/src/node/logger-cli-contribution.spec.ts +++ b/packages/core/src/node/logger-cli-contribution.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/node/logger-cli-contribution.ts b/packages/core/src/node/logger-cli-contribution.ts index ff783a947a3dd..956d0d4d83946 100644 --- a/packages/core/src/node/logger-cli-contribution.ts +++ b/packages/core/src/node/logger-cli-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as yargs from 'yargs'; diff --git a/packages/core/src/node/main.ts b/packages/core/src/node/main.ts index 55b7b70116674..4201405592221 100644 --- a/packages/core/src/node/main.ts +++ b/packages/core/src/node/main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/node/messaging/binary-message-pipe.ts b/packages/core/src/node/messaging/binary-message-pipe.ts index 1143aef9cf4cc..5669b36cefdd6 100644 --- a/packages/core/src/node/messaging/binary-message-pipe.ts +++ b/packages/core/src/node/messaging/binary-message-pipe.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Duplex } from 'stream'; diff --git a/packages/core/src/node/messaging/connection-container-module.ts b/packages/core/src/node/messaging/connection-container-module.ts index 1afc28557c10e..52406d1585d3b 100644 --- a/packages/core/src/node/messaging/connection-container-module.ts +++ b/packages/core/src/node/messaging/connection-container-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/node/messaging/index.ts b/packages/core/src/node/messaging/index.ts index 23da1fe350586..e31e0ab6e2bc8 100644 --- a/packages/core/src/node/messaging/index.ts +++ b/packages/core/src/node/messaging/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './messaging-service'; diff --git a/packages/core/src/node/messaging/ipc-bootstrap.ts b/packages/core/src/node/messaging/ipc-bootstrap.ts index d46d63efa9071..7089889f94f90 100644 --- a/packages/core/src/node/messaging/ipc-bootstrap.ts +++ b/packages/core/src/node/messaging/ipc-bootstrap.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import 'reflect-metadata'; diff --git a/packages/core/src/node/messaging/ipc-channel.ts b/packages/core/src/node/messaging/ipc-channel.ts index acc65e5c6f38b..7434ad15c3f21 100644 --- a/packages/core/src/node/messaging/ipc-channel.ts +++ b/packages/core/src/node/messaging/ipc-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/core/src/node/messaging/ipc-connection-provider.ts b/packages/core/src/node/messaging/ipc-connection-provider.ts index d1ab9c0e551bf..b24b667a9b58b 100644 --- a/packages/core/src/node/messaging/ipc-connection-provider.ts +++ b/packages/core/src/node/messaging/ipc-connection-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/core/src/node/messaging/ipc-protocol.ts b/packages/core/src/node/messaging/ipc-protocol.ts index 03aa3944521c3..4fb65c3248ad6 100644 --- a/packages/core/src/node/messaging/ipc-protocol.ts +++ b/packages/core/src/node/messaging/ipc-protocol.ts @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Channel } from '../../common/message-rpc/channel'; diff --git a/packages/core/src/node/messaging/messaging-backend-module.ts b/packages/core/src/node/messaging/messaging-backend-module.ts index 893afb6edabb9..4f549efb75922 100644 --- a/packages/core/src/node/messaging/messaging-backend-module.ts +++ b/packages/core/src/node/messaging/messaging-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from 'inversify'; diff --git a/packages/core/src/node/messaging/messaging-contribution.ts b/packages/core/src/node/messaging/messaging-contribution.ts index 2f906da0b1189..635db758c3457 100644 --- a/packages/core/src/node/messaging/messaging-contribution.ts +++ b/packages/core/src/node/messaging/messaging-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/node/messaging/messaging-listeners.ts b/packages/core/src/node/messaging/messaging-listeners.ts index b3f6829d45be0..b6c53853a3e6f 100644 --- a/packages/core/src/node/messaging/messaging-listeners.ts +++ b/packages/core/src/node/messaging/messaging-listeners.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/node/messaging/messaging-service.ts b/packages/core/src/node/messaging/messaging-service.ts index 276b58734bcff..7d4ad45432e4e 100644 --- a/packages/core/src/node/messaging/messaging-service.ts +++ b/packages/core/src/node/messaging/messaging-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Socket } from 'socket.io'; diff --git a/packages/core/src/node/messaging/test/test-web-socket-channel.ts b/packages/core/src/node/messaging/test/test-web-socket-channel.ts index 0ef0c50186cee..65c4ed1e641e9 100644 --- a/packages/core/src/node/messaging/test/test-web-socket-channel.ts +++ b/packages/core/src/node/messaging/test/test-web-socket-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/core/src/node/os-backend-application-contribution.ts b/packages/core/src/node/os-backend-application-contribution.ts index 35618ec60139d..0c979e4559517 100644 --- a/packages/core/src/node/os-backend-application-contribution.ts +++ b/packages/core/src/node/os-backend-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as express from 'express'; diff --git a/packages/core/src/node/performance/index.ts b/packages/core/src/node/performance/index.ts index ae2a30b1e2edb..9b2baa19d99c5 100644 --- a/packages/core/src/node/performance/index.ts +++ b/packages/core/src/node/performance/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './node-stopwatch'; diff --git a/packages/core/src/node/performance/measurement-backend-bindings.ts b/packages/core/src/node/performance/measurement-backend-bindings.ts index 7fedefa30a010..f64ee3c91594a 100644 --- a/packages/core/src/node/performance/measurement-backend-bindings.ts +++ b/packages/core/src/node/performance/measurement-backend-bindings.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ import { interfaces } from 'inversify'; diff --git a/packages/core/src/node/performance/node-stopwatch.ts b/packages/core/src/node/performance/node-stopwatch.ts index da7fc89bc7372..57f33286c1681 100644 --- a/packages/core/src/node/performance/node-stopwatch.ts +++ b/packages/core/src/node/performance/node-stopwatch.ts @@ -11,7 +11,7 @@ * 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 +* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************/ import { injectable } from 'inversify'; diff --git a/packages/core/src/node/process-utils.spec.ts b/packages/core/src/node/process-utils.spec.ts index 43c653e5d66f7..938d1c4610cfe 100644 --- a/packages/core/src/node/process-utils.spec.ts +++ b/packages/core/src/node/process-utils.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/core/src/node/process-utils.ts b/packages/core/src/node/process-utils.ts index 3972667a23050..84c176599c0e3 100644 --- a/packages/core/src/node/process-utils.ts +++ b/packages/core/src/node/process-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/core/src/node/request/backend-request-facade.ts b/packages/core/src/node/request/backend-request-facade.ts index b212772b33489..e3a5a84c80e72 100644 --- a/packages/core/src/node/request/backend-request-facade.ts +++ b/packages/core/src/node/request/backend-request-facade.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/node/request/backend-request-module.ts b/packages/core/src/node/request/backend-request-module.ts index 10397317ddd1b..52b3bfa1b6636 100644 --- a/packages/core/src/node/request/backend-request-module.ts +++ b/packages/core/src/node/request/backend-request-module.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContainerModule, decorate, injectable } from 'inversify'; diff --git a/packages/core/src/node/request/proxy-cli-contribution.ts b/packages/core/src/node/request/proxy-cli-contribution.ts index bde6a864437bc..72fc3b482e12f 100644 --- a/packages/core/src/node/request/proxy-cli-contribution.ts +++ b/packages/core/src/node/request/proxy-cli-contribution.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable } from 'inversify'; diff --git a/packages/core/src/node/ws-request-validators.ts b/packages/core/src/node/ws-request-validators.ts index 0adb1628907d3..ca04bc46a48fb 100644 --- a/packages/core/src/node/ws-request-validators.ts +++ b/packages/core/src/node/ws-request-validators.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from 'inversify'; diff --git a/packages/core/src/typings/native-keymap.d.ts b/packages/core/src/typings/native-keymap.d.ts index 7d777c66a672b..9e328e40aa043 100644 --- a/packages/core/src/typings/native-keymap.d.ts +++ b/packages/core/src/typings/native-keymap.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/debug/package.json b/packages/debug/package.json index 6837df835caf6..5c893cb67a569 100644 --- a/packages/debug/package.json +++ b/packages/debug/package.json @@ -34,7 +34,7 @@ "theia-extension", "debug" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/debug/src/browser/breakpoint/breakpoint-manager.ts b/packages/debug/src/browser/breakpoint/breakpoint-manager.ts index 5a43f816a4bd6..13f4de067298a 100644 --- a/packages/debug/src/browser/breakpoint/breakpoint-manager.ts +++ b/packages/debug/src/browser/breakpoint/breakpoint-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as deepEqual from 'fast-deep-equal'; diff --git a/packages/debug/src/browser/breakpoint/breakpoint-marker.ts b/packages/debug/src/browser/breakpoint/breakpoint-marker.ts index 1564f4b3ee781..4a65d55379963 100644 --- a/packages/debug/src/browser/breakpoint/breakpoint-marker.ts +++ b/packages/debug/src/browser/breakpoint/breakpoint-marker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { UUID } from '@theia/core/shared/@phosphor/coreutils'; diff --git a/packages/debug/src/browser/console/debug-console-contribution.tsx b/packages/debug/src/browser/console/debug-console-contribution.tsx index e9cd1f73f792b..a4ab5db8fb2b3 100644 --- a/packages/debug/src/browser/console/debug-console-contribution.tsx +++ b/packages/debug/src/browser/console/debug-console-contribution.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ConsoleSessionManager } from '@theia/console/lib/browser/console-session-manager'; diff --git a/packages/debug/src/browser/console/debug-console-items.tsx b/packages/debug/src/browser/console/debug-console-items.tsx index 1afca44537fbe..c920e4a27fab6 100644 --- a/packages/debug/src/browser/console/debug-console-items.tsx +++ b/packages/debug/src/browser/console/debug-console-items.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/console/debug-console-session.ts b/packages/debug/src/browser/console/debug-console-session.ts index 16aa37daa39a1..761d17ae25387 100644 --- a/packages/debug/src/browser/console/debug-console-session.ts +++ b/packages/debug/src/browser/console/debug-console-session.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import throttle = require('@theia/core/shared/lodash.throttle'); diff --git a/packages/debug/src/browser/debug-call-stack-item-type-key.ts b/packages/debug/src/browser/debug-call-stack-item-type-key.ts index bef69246a9560..92215f983c79b 100644 --- a/packages/debug/src/browser/debug-call-stack-item-type-key.ts +++ b/packages/debug/src/browser/debug-call-stack-item-type-key.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContextKey } from '@theia/core/lib/browser/context-key-service'; diff --git a/packages/debug/src/browser/debug-configuration-manager.ts b/packages/debug/src/browser/debug-configuration-manager.ts index f6b503ed5d06e..aac2f407d7d31 100644 --- a/packages/debug/src/browser/debug-configuration-manager.ts +++ b/packages/debug/src/browser/debug-configuration-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/browser/debug-configuration-model.ts b/packages/debug/src/browser/debug-configuration-model.ts index 2d5ae56d10ad3..173c54f8131dc 100644 --- a/packages/debug/src/browser/debug-configuration-model.ts +++ b/packages/debug/src/browser/debug-configuration-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/debug/src/browser/debug-contribution.ts b/packages/debug/src/browser/debug-contribution.ts index a19ef776486c4..39849598a62e5 100644 --- a/packages/debug/src/browser/debug-contribution.ts +++ b/packages/debug/src/browser/debug-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebugProtocol } from '@vscode/debugprotocol'; diff --git a/packages/debug/src/browser/debug-frontend-application-contribution.ts b/packages/debug/src/browser/debug-frontend-application-contribution.ts index ccdd2749f4dd6..2cf829a74c996 100644 --- a/packages/debug/src/browser/debug-frontend-application-contribution.ts +++ b/packages/debug/src/browser/debug-frontend-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/debug/src/browser/debug-frontend-module.ts b/packages/debug/src/browser/debug-frontend-module.ts index 1d9d44ea61bc0..f645edb64657c 100644 --- a/packages/debug/src/browser/debug-frontend-module.ts +++ b/packages/debug/src/browser/debug-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/debug/src/browser/debug-keybinding-contexts.ts b/packages/debug/src/browser/debug-keybinding-contexts.ts index 26b0dae7e9967..6c8ea255ba896 100644 --- a/packages/debug/src/browser/debug-keybinding-contexts.ts +++ b/packages/debug/src/browser/debug-keybinding-contexts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-package.spec.ts b/packages/debug/src/browser/debug-package.spec.ts index a723b0ed86c47..36b6c63c28937 100644 --- a/packages/debug/src/browser/debug-package.spec.ts +++ b/packages/debug/src/browser/debug-package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** describe('debug package', () => { diff --git a/packages/debug/src/browser/debug-preferences.ts b/packages/debug/src/browser/debug-preferences.ts index a009710bc9306..8c3c0a85c1b52 100644 --- a/packages/debug/src/browser/debug-preferences.ts +++ b/packages/debug/src/browser/debug-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core/lib/common/nls'; diff --git a/packages/debug/src/browser/debug-prefix-configuration.ts b/packages/debug/src/browser/debug-prefix-configuration.ts index b03250412fa2c..f61b9ec5793e9 100644 --- a/packages/debug/src/browser/debug-prefix-configuration.ts +++ b/packages/debug/src/browser/debug-prefix-configuration.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-resource.ts b/packages/debug/src/browser/debug-resource.ts index 3a969bb755fc3..4a81cbc1731eb 100644 --- a/packages/debug/src/browser/debug-resource.ts +++ b/packages/debug/src/browser/debug-resource.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-schema-updater.ts b/packages/debug/src/browser/debug-schema-updater.ts index 65aff2a5e7c6b..f8ec0c108065b 100644 --- a/packages/debug/src/browser/debug-schema-updater.ts +++ b/packages/debug/src/browser/debug-schema-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-session-connection.ts b/packages/debug/src/browser/debug-session-connection.ts index e8ca6c9ec7123..290886e06e6ce 100644 --- a/packages/debug/src/browser/debug-session-connection.ts +++ b/packages/debug/src/browser/debug-session-connection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/debug/src/browser/debug-session-contribution.ts b/packages/debug/src/browser/debug-session-contribution.ts index 8392adac28637..04d36c3c645fb 100644 --- a/packages/debug/src/browser/debug-session-contribution.ts +++ b/packages/debug/src/browser/debug-session-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-session-manager.ts b/packages/debug/src/browser/debug-session-manager.ts index 19fcb5c9b5546..adae46254f038 100644 --- a/packages/debug/src/browser/debug-session-manager.ts +++ b/packages/debug/src/browser/debug-session-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DisposableCollection, Emitter, Event, MessageService, nls, ProgressService, WaitUntilEvent } from '@theia/core'; diff --git a/packages/debug/src/browser/debug-session-options.ts b/packages/debug/src/browser/debug-session-options.ts index d4a9bb66c2ac6..3e61d0ec4dfaa 100644 --- a/packages/debug/src/browser/debug-session-options.ts +++ b/packages/debug/src/browser/debug-session-options.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter } from '@theia/core'; diff --git a/packages/debug/src/browser/debug-session.tsx b/packages/debug/src/browser/debug-session.tsx index 050eec8c889fa..66b86ec487b7e 100644 --- a/packages/debug/src/browser/debug-session.tsx +++ b/packages/debug/src/browser/debug-session.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/debug/src/browser/debug-tab-bar-decorator.ts b/packages/debug/src/browser/debug-tab-bar-decorator.ts index 76ffbc5c2a923..833167953aff8 100644 --- a/packages/debug/src/browser/debug-tab-bar-decorator.ts +++ b/packages/debug/src/browser/debug-tab-bar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/debug-watch-manager.ts b/packages/debug/src/browser/debug-watch-manager.ts index 14c1775c6ea20..37d9db8674a65 100644 --- a/packages/debug/src/browser/debug-watch-manager.ts +++ b/packages/debug/src/browser/debug-watch-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-accessibility-provider.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-accessibility-provider.ts index afeca2a4a9a1a..c9e26b0f70384 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-accessibility-provider.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-accessibility-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-breakpoint-renderer.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-breakpoint-renderer.ts index c688b5435f8d9..8fa18d2560fe5 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-breakpoint-renderer.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-breakpoint-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { append, $, addStandardDisposableListener } from '@theia/monaco-editor-core/esm/vs/base/browser/dom'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-contribution.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-contribution.ts index f99cbededfb62..a677b55b5b075 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-contribution.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts index 6e6bac9d15ba6..1fb92dfd9fd23 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-instruction-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { open, OpenerService } from '@theia/core/lib/browser'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-table-delegate.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-table-delegate.ts index c52adefc80fc5..fabd55f3cf934 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-table-delegate.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-table-delegate.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ITableVirtualDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/table/table'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-utilities.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-utilities.ts index 4b0c71babc9f3..e7b13c0ec74d0 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-utilities.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-utilities.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { IDisposable, IEvent } from '@theia/monaco-editor-core'; diff --git a/packages/debug/src/browser/disassembly-view/disassembly-view-widget.ts b/packages/debug/src/browser/disassembly-view/disassembly-view-widget.ts index ee34a00a88eec..822a9456225bc 100644 --- a/packages/debug/src/browser/disassembly-view/disassembly-view-widget.ts +++ b/packages/debug/src/browser/disassembly-view/disassembly-view-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx index acbb154e08d9d..94adf2b25869d 100644 --- a/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx +++ b/packages/debug/src/browser/editor/debug-breakpoint-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/editor/debug-editor-model.ts b/packages/debug/src/browser/editor/debug-editor-model.ts index 9a97cdffcd1dd..1fe6b2200158b 100644 --- a/packages/debug/src/browser/editor/debug-editor-model.ts +++ b/packages/debug/src/browser/editor/debug-editor-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('p-debounce'); diff --git a/packages/debug/src/browser/editor/debug-editor-service.ts b/packages/debug/src/browser/editor/debug-editor-service.ts index 59bd35335e3ca..666be185e087a 100644 --- a/packages/debug/src/browser/editor/debug-editor-service.ts +++ b/packages/debug/src/browser/editor/debug-editor-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/editor/debug-editor.ts b/packages/debug/src/browser/editor/debug-editor.ts index 3cc7c35f470b0..62def542cddc3 100644 --- a/packages/debug/src/browser/editor/debug-editor.ts +++ b/packages/debug/src/browser/editor/debug-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor'; diff --git a/packages/debug/src/browser/editor/debug-exception-widget.tsx b/packages/debug/src/browser/editor/debug-exception-widget.tsx index 0ea29db362142..7a6f6e74572e7 100644 --- a/packages/debug/src/browser/editor/debug-exception-widget.tsx +++ b/packages/debug/src/browser/editor/debug-exception-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/editor/debug-expression-provider.ts b/packages/debug/src/browser/editor/debug-expression-provider.ts index a6a020906c353..e9a16d202e356 100644 --- a/packages/debug/src/browser/editor/debug-expression-provider.ts +++ b/packages/debug/src/browser/editor/debug-expression-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation and others. All rights reserved. diff --git a/packages/debug/src/browser/editor/debug-hover-source.tsx b/packages/debug/src/browser/editor/debug-hover-source.tsx index 95c6fd5d118e9..db9dcccb0a127 100644 --- a/packages/debug/src/browser/editor/debug-hover-source.tsx +++ b/packages/debug/src/browser/editor/debug-hover-source.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/editor/debug-hover-widget.ts b/packages/debug/src/browser/editor/debug-hover-widget.ts index 3ec57f795637e..22f30493899f7 100644 --- a/packages/debug/src/browser/editor/debug-hover-widget.ts +++ b/packages/debug/src/browser/editor/debug-hover-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('@theia/core/shared/lodash.debounce'); diff --git a/packages/debug/src/browser/editor/debug-inline-value-decorator.ts b/packages/debug/src/browser/editor/debug-inline-value-decorator.ts index 4f22e05ad92d7..bb55a7097605d 100644 --- a/packages/debug/src/browser/editor/debug-inline-value-decorator.ts +++ b/packages/debug/src/browser/editor/debug-inline-value-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/browser/model/debug-breakpoint.tsx b/packages/debug/src/browser/model/debug-breakpoint.tsx index f0c70bbb0e365..c9ab047e481e5 100644 --- a/packages/debug/src/browser/model/debug-breakpoint.tsx +++ b/packages/debug/src/browser/model/debug-breakpoint.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/model/debug-function-breakpoint.tsx b/packages/debug/src/browser/model/debug-function-breakpoint.tsx index 8b3ef92909c4c..6e8e1464d7e62 100644 --- a/packages/debug/src/browser/model/debug-function-breakpoint.tsx +++ b/packages/debug/src/browser/model/debug-function-breakpoint.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/model/debug-instruction-breakpoint.tsx b/packages/debug/src/browser/model/debug-instruction-breakpoint.tsx index bbc32e6823d86..f8fe7e468010c 100644 --- a/packages/debug/src/browser/model/debug-instruction-breakpoint.tsx +++ b/packages/debug/src/browser/model/debug-instruction-breakpoint.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/debug/src/browser/model/debug-source-breakpoint.tsx b/packages/debug/src/browser/model/debug-source-breakpoint.tsx index d079d069ef858..b8e61e1e3a65c 100644 --- a/packages/debug/src/browser/model/debug-source-breakpoint.tsx +++ b/packages/debug/src/browser/model/debug-source-breakpoint.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/model/debug-source.ts b/packages/debug/src/browser/model/debug-source.ts index 5b60bab2c61b3..6e47ec3a7d1ac 100644 --- a/packages/debug/src/browser/model/debug-source.ts +++ b/packages/debug/src/browser/model/debug-source.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { LabelProvider } from '@theia/core/lib/browser'; diff --git a/packages/debug/src/browser/model/debug-stack-frame.tsx b/packages/debug/src/browser/model/debug-stack-frame.tsx index 67b3c14ced513..d03831d67dae4 100644 --- a/packages/debug/src/browser/model/debug-stack-frame.tsx +++ b/packages/debug/src/browser/model/debug-stack-frame.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/browser/model/debug-thread.tsx b/packages/debug/src/browser/model/debug-thread.tsx index 5495ff81bb246..6b5ba63bd0d2a 100644 --- a/packages/debug/src/browser/model/debug-thread.tsx +++ b/packages/debug/src/browser/model/debug-thread.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/preferences/launch-preferences.ts b/packages/debug/src/browser/preferences/launch-preferences.ts index 46115fee5e636..d2f37131dd4f6 100644 --- a/packages/debug/src/browser/preferences/launch-preferences.ts +++ b/packages/debug/src/browser/preferences/launch-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/style/index.css b/packages/debug/src/browser/style/index.css index b30b56df3b594..cc3aeef94a6ec 100644 --- a/packages/debug/src/browser/style/index.css +++ b/packages/debug/src/browser/style/index.css @@ -11,27 +11,26 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-debug-container, .theia-session-container { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; } - .theia-debug-container .theia-select { - margin-left: var(--theia-ui-padding); + margin-left: var(--theia-ui-padding); } .theia-source-breakpoint, .theia-debug-session, .theia-debug-thread, .theia-debug-stack-frame { - display: flex; - align-items: center; + display: flex; + align-items: center; } .theia-source-breakpoint > span, @@ -39,202 +38,202 @@ .theia-debug-thread > span, .theia-debug-stack-frame > span, .theia-debug-stack-frame .file > span { - margin-left: calc(var(--theia-ui-padding)/2); + margin-left: calc(var(--theia-ui-padding) / 2); } .theia-debug-session .label, .theia-debug-thread .label, .theia-debug-stack-frame .expression { - width: 100%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .theia-source-breakpoint .path { - font-size: var(--theia-ui-font-size0); + font-size: var(--theia-ui-font-size0); } .theia-source-breakpoint .line-info { - overflow: hidden; - text-overflow: ellipsis; - width: 100%; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; + white-space: nowrap; } .theia-source-breakpoint .line, .theia-debug-stack-frame .line { - background: var(--theia-descriptionForeground); - color: var(--theia-editor-background); - padding: calc(var(--theia-ui-padding)/3); - font-size: var(--theia-ui-font-size0); - line-height: calc(var(--theia-private-horizontal-tab-height)/2); - border-radius: 2px; + background: var(--theia-descriptionForeground); + color: var(--theia-editor-background); + padding: calc(var(--theia-ui-padding) / 3); + font-size: var(--theia-ui-font-size0); + line-height: calc(var(--theia-private-horizontal-tab-height) / 2); + border-radius: 2px; } .theia-debug-session .status, .theia-debug-thread .status { - text-transform: uppercase; - white-space: nowrap; + text-transform: uppercase; + white-space: nowrap; } .theia-debug-stack-frame .expression { - white-space: pre; + white-space: pre; } .theia-debug-stack-frame.label { - text-align: center; - font-style: italic; + text-align: center; + font-style: italic; } .theia-debug-stack-frame.subtle { - font-style: italic; + font-style: italic; } .theia-debug-stack-frame .file > span { - white-space: nowrap; + white-space: nowrap; } .theia-load-more-frames { - text-align: center; - font-style: italic; - white-space: nowrap; - display: flex; - flex-direction: column; + text-align: center; + font-style: italic; + white-space: nowrap; + display: flex; + flex-direction: column; } /** Miscellaneous */ .debug-toolbar { - display: flex; - align-items: center; - padding-top: calc(var(--theia-ui-padding)*2); - padding-right: calc(var(--theia-ui-padding)*3); - padding-bottom: var(--theia-ui-padding); - padding-left: calc(var(--theia-ui-padding)*2); + display: flex; + align-items: center; + padding-top: calc(var(--theia-ui-padding) * 2); + padding-right: calc(var(--theia-ui-padding) * 3); + padding-bottom: var(--theia-ui-padding); + padding-left: calc(var(--theia-ui-padding) * 2); } .theia-session-container > .debug-toolbar { - padding-top: var(--theia-ui-padding); - padding-bottom: var(--theia-ui-padding); - border-bottom: 1px solid var(--theia-sideBarSectionHeader-border); + padding-top: var(--theia-ui-padding); + padding-bottom: var(--theia-ui-padding); + border-bottom: 1px solid var(--theia-sideBarSectionHeader-border); } .debug-toolbar .theia-select-component { - width: 100%; - min-width: 40px; - margin: 0px 4px; + width: 100%; + min-width: 40px; + margin: 0px 4px; } .debug-toolbar .debug-action { - opacity: 0.9; - cursor: pointer; - pointer-events: all; - padding-left: var(--theia-ui-padding); - padding-right: var(--theia-ui-padding); - min-width: var(--theia-icon-size); - min-height: var(--theia-icon-size); + opacity: 0.9; + cursor: pointer; + pointer-events: all; + padding-left: var(--theia-ui-padding); + padding-right: var(--theia-ui-padding); + min-width: var(--theia-icon-size); + min-height: var(--theia-icon-size); } .debug-toolbar .debug-action.theia-mod-disabled { - opacity: 0.5 !important; - user-select: none; - pointer-events: none; + opacity: 0.5 !important; + user-select: none; + pointer-events: none; } .debug-toolbar .debug-action:not(.theia-mod-disabled):hover { - opacity: 1; + opacity: 1; } -.debug-toolbar .debug-action>div { - font-family: var(--theia-ui-font-family); - font-size: var(--theia-ui-font-size0); - display: flex; - align-items: center; - align-self: center; - justify-content: center; - text-align: center; - min-height: inherit; +.debug-toolbar .debug-action > div { + font-family: var(--theia-ui-font-family); + font-size: var(--theia-ui-font-size0); + display: flex; + align-items: center; + align-self: center; + justify-content: center; + text-align: center; + min-height: inherit; } /** Console */ #debug-console .theia-console-info { - color: var(--theia-debugConsole-infoForeground) !important; + color: var(--theia-debugConsole-infoForeground) !important; } #debug-console .theia-console-warning { - color: var(--theia-debugConsole-warningForeground) !important; + color: var(--theia-debugConsole-warningForeground) !important; } #debug-console .theia-console-error { - color: var(--theia-debugConsole-errorForeground) !important; + color: var(--theia-debugConsole-errorForeground) !important; } .theia-debug-console-unavailable { - font-style: italic; + font-style: italic; } .theia-debug-console-expression { - display: flex; - flex-direction: column; - white-space: pre-wrap; + display: flex; + flex-direction: column; + white-space: pre-wrap; } .theia-debug-console-variable { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: var(--theia-variable-value-color); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: var(--theia-variable-value-color); } .theia-debug-hover-title.number, .theia-debug-console-variable.number { - color: var(--theia-variable-number-variable-color); + color: var(--theia-variable-number-variable-color); } .theia-debug-hover-title.boolean, .theia-debug-console-variable.boolean { - color: var(--theia-variable-boolean-variable-color); + color: var(--theia-variable-boolean-variable-color); } .theia-debug-hover-title.string, .theia-debug-console-variable.string { - color: var(--theia-variable-string-variable-color); + color: var(--theia-variable-string-variable-color); } .theia-debug-console-variable .name { - color: var(--theia-variable-name-color); + color: var(--theia-variable-name-color); } .theia-TreeNode:not(:hover) .theia-debug-console-variable .action-label { - visibility: hidden; + visibility: hidden; } .theia-debug-console-variable .action-label { - /* Vertically center the button in the tree node */ - margin: auto; + /* Vertically center the button in the tree node */ + margin: auto; } .theia-debug-console-variable .watch-error { - font-style: italic; - color: var(--theia-debugConsole-errorForeground); + font-style: italic; + color: var(--theia-debugConsole-errorForeground); } .theia-debug-watch-expression { - display: flex; + display: flex; } /** Editor **/ .theia-debug-breakpoint-icon { - font-size: 19px !important; - width: 19px; - height: 19px; - min-width: 19px; - margin-left: 0px !important; + font-size: 19px !important; + width: 19px; + height: 19px; + min-width: 19px; + margin-left: 0px !important; } .codicon-debug-hint { - cursor: pointer; + cursor: pointer; } .codicon-debug-breakpoint, @@ -243,203 +242,212 @@ .codicon-debug-breakpoint-function, .codicon-debug-breakpoint-data, .codicon-debug-breakpoint-unsupported, -.codicon-debug-hint:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']), +.codicon-debug-hint:not([class*="codicon-debug-breakpoint"]):not( + [class*="codicon-debug-stackframe"] + ), .codicon-debug-breakpoint.codicon-debug-stackframe-focused::after, .codicon-debug-breakpoint.codicon-debug-stackframe::after { - color: var(--theia-debugIcon-breakpointForeground) !important; + color: var(--theia-debugIcon-breakpointForeground) !important; } -.codicon[class*='-disabled'] { - color: var(--theia-debugIcon-breakpointDisabledForeground) !important; +.codicon[class*="-disabled"] { + color: var(--theia-debugIcon-breakpointDisabledForeground) !important; } -.codicon[class*='-unverified'] { - color: var(--theia-debugIcon-breakpointUnverifiedForeground) !important; +.codicon[class*="-unverified"] { + color: var(--theia-debugIcon-breakpointUnverifiedForeground) !important; } .codicon-debug-stackframe, .monaco-editor .theia-debug-top-stack-frame-column::before { - color: var(--theia-debugIcon-breakpointCurrentStackframeForeground) !important; + color: var( + --theia-debugIcon-breakpointCurrentStackframeForeground + ) !important; } .codicon-debug-stackframe-focused { - color: var(--theia-debugIcon-breakpointStackframeForeground) !important; + color: var(--theia-debugIcon-breakpointStackframeForeground) !important; } .codicon-debug-breakpoint.codicon-debug-stackframe-focused::after, .codicon-debug-breakpoint.codicon-debug-stackframe::after { - content: '\eb8a'; - position: absolute; + content: "\eb8a"; + position: absolute; } .monaco-editor .theia-debug-breakpoint-column::before { - height: .9em; - display: inline-flex; - vertical-align: middle; + height: 0.9em; + display: inline-flex; + vertical-align: middle; } .monaco-editor .theia-debug-top-stack-frame-column::before { - content: ' '; - width: 0.9em; - display: inline-flex; - vertical-align: middle; - margin-top: -1px; /* TODO @misolori: figure out a way to not use negative margin for alignment */ + content: " "; + width: 0.9em; + display: inline-flex; + vertical-align: middle; + margin-top: -1px; /* TODO @misolori: figure out a way to not use negative margin for alignment */ } .monaco-editor .theia-debug-top-stack-frame-column { - display: inline-flex; - vertical-align: middle; + display: inline-flex; + vertical-align: middle; } .monaco-editor .theia-debug-top-stack-frame-column::before { - content: '\eb8b'; - font: normal normal normal 16px/1 codicon; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - margin-left: 0; - margin-right: 4px; + content: "\eb8b"; + font: normal normal normal 16px/1 codicon; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + margin-left: 0; + margin-right: 4px; } -.codicon-debug-hint:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']) { - opacity: 0.4 !important; +.codicon-debug-hint:not([class*="codicon-debug-breakpoint"]):not( + [class*="codicon-debug-stackframe"] + ) { + opacity: 0.4 !important; } .monaco-editor .view-overlays .theia-debug-top-stack-frame-line { - background: var(--theia-editor-stackFrameHighlightBackground); + background: var(--theia-editor-stackFrameHighlightBackground); } .monaco-editor .view-overlays .theia-debug-focused-stack-frame-line { - background: var(--theia-editor-focusedStackFrameHighlightBackground); + background: var(--theia-editor-focusedStackFrameHighlightBackground); } /** Toolbars */ .codicon-debug-start { - color: var(--theia-debugIcon-startForeground) !important; + color: var(--theia-debugIcon-startForeground) !important; } .codicon-debug-pause { - color: var(--theia-debugIcon-pauseForeground) !important; + color: var(--theia-debugIcon-pauseForeground) !important; } .codicon-debug-stop { - color: var(--theia-debugIcon-stopForeground) !important; + color: var(--theia-debugIcon-stopForeground) !important; } .codicon-debug-disconnect { - color: var(--theia-debugIcon-disconnectForeground) !important; + color: var(--theia-debugIcon-disconnectForeground) !important; } .codicon-debug-restart, .codicon-debug-restart-frame { - color: var(--theia-debugIcon-restartForeground) !important; + color: var(--theia-debugIcon-restartForeground) !important; } .codicon-debug-step-over { - color: var(--theia-debugIcon-stepOverForeground) !important; + color: var(--theia-debugIcon-stepOverForeground) !important; } .codicon-debug-step-into { - color: var(--theia-debugIcon-stepIntoForeground) !important; + color: var(--theia-debugIcon-stepIntoForeground) !important; } .codicon-debug-step-out { - color: var(--theia-debugIcon-stepOutForeground) !important; + color: var(--theia-debugIcon-stepOutForeground) !important; } .codicon-debug-continue, .codicon-debug-reverse-continue { - color: var(--theia-debugIcon-continueForeground) !important; + color: var(--theia-debugIcon-continueForeground) !important; } .codicon-debug-step-back { - color: var(--theia-debugIcon-stepBackForeground) !important; + color: var(--theia-debugIcon-stepBackForeground) !important; } /** Hover */ .theia-debug-hover { - display: flex !important; - flex-direction: column; - border: 1px solid var(--theia-editorHoverWidget-border); - background: var(--theia-editorHoverWidget-background); - color: var(--theia-editorHoverWidget-foreground); + display: flex !important; + flex-direction: column; + border: 1px solid var(--theia-editorHoverWidget-border); + background: var(--theia-editorHoverWidget-background); + color: var(--theia-editorHoverWidget-foreground); } .theia-debug-hover.complex-value { - min-width: 324px; - min-height: 324px; - width: 324px; - height: 324px; + min-width: 324px; + min-height: 324px; + width: 324px; + height: 324px; } .theia-debug-hover .theia-source-tree { - height: 100%; - width: 100%; + height: 100%; + width: 100%; } .theia-debug-hover-title { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - padding: var(--theia-ui-padding); - border-bottom: 1px solid var(--theia-editorHoverWidget-border); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + padding: var(--theia-ui-padding); + border-bottom: 1px solid var(--theia-editorHoverWidget-border); } .theia-debug-hover-content { - display: flex; - flex: 1; - overflow-y: auto; + display: flex; + flex: 1; + overflow-y: auto; } /** Breakpoint Widget */ .theia-debug-breakpoint-widget { - display: flex; + display: flex; } .theia-debug-breakpoint-select { - display: flex; - justify-content: center; - flex-direction: column; - padding: 0 10px; - flex-shrink: 0; + display: flex; + justify-content: center; + flex-direction: column; + padding: 0 10px; + flex-shrink: 0; } .theia-debug-breakpoint-input { - flex: 1; - margin-top: var(--theia-ui-padding); - margin-bottom: var(--theia-ui-padding); + flex: 1; + margin-top: var(--theia-ui-padding); + margin-bottom: var(--theia-ui-padding); } /* Status Bar */ .theia-mod-debugging #theia-statusBar { - background: var(--theia-statusBar-debuggingBackground); - border-top: var(--theia-border-width) solid var(--theia-statusBar-debuggingBorder); + background: var(--theia-statusBar-debuggingBackground); + border-top: var(--theia-border-width) solid + var(--theia-statusBar-debuggingBorder); } .theia-mod-debugging #theia-statusBar .area .element { - color: var(--theia-statusBar-debuggingForeground); + color: var(--theia-statusBar-debuggingForeground); } /** Exception Widget */ -.monaco-editor .zone-widget .zone-widget-container.theia-debug-exception-widget { - color: var(--theia-editor-foreground); - font-size: var(--theia-code-font-size); - line-height: var(--theia-code-line-height); - font-family: var(--theia-code-font-family); - border-top-color: var(--theia-debugExceptionWidget-border); - border-bottom-color: var(--theia-debugExceptionWidget-border); - background-color: var(--theia-debugExceptionWidget-background); - padding: var(--theia-ui-padding) calc(var(--theia-ui-padding)*1.5); - white-space: pre-wrap; - user-select: text; - overflow: hidden; +.monaco-editor + .zone-widget + .zone-widget-container.theia-debug-exception-widget { + color: var(--theia-editor-foreground); + font-size: var(--theia-code-font-size); + line-height: var(--theia-code-line-height); + font-family: var(--theia-code-font-family); + border-top-color: var(--theia-debugExceptionWidget-border); + border-bottom-color: var(--theia-debugExceptionWidget-border); + background-color: var(--theia-debugExceptionWidget-background); + padding: var(--theia-ui-padding) calc(var(--theia-ui-padding) * 1.5); + white-space: pre-wrap; + user-select: text; + overflow: hidden; } .theia-debug-exception-widget .title { - font-family: var(--theia-ui-font-family); - font-weight: bold; + font-family: var(--theia-ui-font-family); + font-weight: bold; } .theia-debug-exception-widget .stack-trace { - margin-top: 0.5em; + margin-top: 0.5em; } .theia-debug-exception-widget #exception-close { - cursor: pointer; - margin-left: 5px; - vertical-align: middle; + cursor: pointer; + margin-left: 5px; + vertical-align: middle; } diff --git a/packages/debug/src/browser/view/debug-action.tsx b/packages/debug/src/browser/view/debug-action.tsx index f7ef0a3c19b5b..9e29f5d45d923 100644 --- a/packages/debug/src/browser/view/debug-action.tsx +++ b/packages/debug/src/browser/view/debug-action.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/view/debug-breakpoints-source.tsx b/packages/debug/src/browser/view/debug-breakpoints-source.tsx index be4b474ad4819..8fbbff59f40cb 100644 --- a/packages/debug/src/browser/view/debug-breakpoints-source.tsx +++ b/packages/debug/src/browser/view/debug-breakpoints-source.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-breakpoints-widget.ts b/packages/debug/src/browser/view/debug-breakpoints-widget.ts index b202e42f76672..d7139d69b748d 100644 --- a/packages/debug/src/browser/view/debug-breakpoints-widget.ts +++ b/packages/debug/src/browser/view/debug-breakpoints-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-configuration-select.tsx b/packages/debug/src/browser/view/debug-configuration-select.tsx index ab4368f0128d1..39bff78b5f9cb 100644 --- a/packages/debug/src/browser/view/debug-configuration-select.tsx +++ b/packages/debug/src/browser/view/debug-configuration-select.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import URI from '@theia/core/lib/common/uri'; diff --git a/packages/debug/src/browser/view/debug-configuration-widget.tsx b/packages/debug/src/browser/view/debug-configuration-widget.tsx index 124aeac52fe76..031dbc2ae3309 100644 --- a/packages/debug/src/browser/view/debug-configuration-widget.tsx +++ b/packages/debug/src/browser/view/debug-configuration-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ReactWidget, QuickInputService } from '@theia/core/lib/browser'; diff --git a/packages/debug/src/browser/view/debug-exception-breakpoint.tsx b/packages/debug/src/browser/view/debug-exception-breakpoint.tsx index 583db16efa0b8..3deefffd7cf81 100644 --- a/packages/debug/src/browser/view/debug-exception-breakpoint.tsx +++ b/packages/debug/src/browser/view/debug-exception-breakpoint.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/view/debug-session-widget.ts b/packages/debug/src/browser/view/debug-session-widget.ts index 307bfc6e8dca1..f063492786293 100644 --- a/packages/debug/src/browser/view/debug-session-widget.ts +++ b/packages/debug/src/browser/view/debug-session-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-stack-frames-source.tsx b/packages/debug/src/browser/view/debug-stack-frames-source.tsx index 47337c983c74c..e3b134c048653 100644 --- a/packages/debug/src/browser/view/debug-stack-frames-source.tsx +++ b/packages/debug/src/browser/view/debug-stack-frames-source.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/view/debug-stack-frames-widget.ts b/packages/debug/src/browser/view/debug-stack-frames-widget.ts index d361dc70ba7b4..2be8be2c39d68 100644 --- a/packages/debug/src/browser/view/debug-stack-frames-widget.ts +++ b/packages/debug/src/browser/view/debug-stack-frames-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-threads-source.tsx b/packages/debug/src/browser/view/debug-threads-source.tsx index ab13bda3c7477..373ea1db460c1 100644 --- a/packages/debug/src/browser/view/debug-threads-source.tsx +++ b/packages/debug/src/browser/view/debug-threads-source.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-threads-widget.ts b/packages/debug/src/browser/view/debug-threads-widget.ts index 90c084cb501f9..7933a84352ad1 100644 --- a/packages/debug/src/browser/view/debug-threads-widget.ts +++ b/packages/debug/src/browser/view/debug-threads-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-toolbar-widget.tsx b/packages/debug/src/browser/view/debug-toolbar-widget.tsx index 66c3d0c08d8db..66751758004e1 100644 --- a/packages/debug/src/browser/view/debug-toolbar-widget.tsx +++ b/packages/debug/src/browser/view/debug-toolbar-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/view/debug-variables-source.ts b/packages/debug/src/browser/view/debug-variables-source.ts index 0b77543595bf9..e8291d5cb0822 100644 --- a/packages/debug/src/browser/view/debug-variables-source.ts +++ b/packages/debug/src/browser/view/debug-variables-source.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-variables-widget.ts b/packages/debug/src/browser/view/debug-variables-widget.ts index b3ad8494be8ce..396c7bcfe95d9 100644 --- a/packages/debug/src/browser/view/debug-variables-widget.ts +++ b/packages/debug/src/browser/view/debug-variables-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-view-model.ts b/packages/debug/src/browser/view/debug-view-model.ts index 295e53b63b99f..808fdfda6a5be 100644 --- a/packages/debug/src/browser/view/debug-view-model.ts +++ b/packages/debug/src/browser/view/debug-view-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce from 'p-debounce'; diff --git a/packages/debug/src/browser/view/debug-watch-expression.tsx b/packages/debug/src/browser/view/debug-watch-expression.tsx index 6a905430fc367..1d4bf58d5ac39 100644 --- a/packages/debug/src/browser/view/debug-watch-expression.tsx +++ b/packages/debug/src/browser/view/debug-watch-expression.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/debug/src/browser/view/debug-watch-source.ts b/packages/debug/src/browser/view/debug-watch-source.ts index 7ac7b7048960b..dea593d00f9b1 100644 --- a/packages/debug/src/browser/view/debug-watch-source.ts +++ b/packages/debug/src/browser/view/debug-watch-source.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-watch-widget.ts b/packages/debug/src/browser/view/debug-watch-widget.ts index e25269173540f..801efa9cb6ed4 100644 --- a/packages/debug/src/browser/view/debug-watch-widget.ts +++ b/packages/debug/src/browser/view/debug-watch-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/browser/view/debug-widget.ts b/packages/debug/src/browser/view/debug-widget.ts index 7639c18d0d94b..d5d45bacd13f5 100644 --- a/packages/debug/src/browser/view/debug-widget.ts +++ b/packages/debug/src/browser/view/debug-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct, inject, interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/common/debug-adapter-contribution-registry.ts b/packages/debug/src/common/debug-adapter-contribution-registry.ts index 4bf95d904aa0b..afeac20e7246d 100644 --- a/packages/debug/src/common/debug-adapter-contribution-registry.ts +++ b/packages/debug/src/common/debug-adapter-contribution-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/common/debug-adapter-session.ts b/packages/debug/src/common/debug-adapter-session.ts index 3cbf246695297..ec89cf5e4fae9 100644 --- a/packages/debug/src/common/debug-adapter-session.ts +++ b/packages/debug/src/common/debug-adapter-session.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/common/debug-common.ts b/packages/debug/src/common/debug-common.ts index dc9ba441c039a..c5f6da110f819 100644 --- a/packages/debug/src/common/debug-common.ts +++ b/packages/debug/src/common/debug-common.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // FIXME: refactor extensions to get rid of this file and remove it diff --git a/packages/debug/src/common/debug-compound.ts b/packages/debug/src/common/debug-compound.ts index 01332a0fc9514..49f6784364f00 100644 --- a/packages/debug/src/common/debug-compound.ts +++ b/packages/debug/src/common/debug-compound.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from '@theia/core/lib/common'; diff --git a/packages/debug/src/common/debug-configuration.ts b/packages/debug/src/common/debug-configuration.ts index b987311df3d86..b441a39416abe 100644 --- a/packages/debug/src/common/debug-configuration.ts +++ b/packages/debug/src/common/debug-configuration.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from '@theia/core/lib/common'; import { TaskIdentifier } from '@theia/task/lib/common'; diff --git a/packages/debug/src/common/debug-model.ts b/packages/debug/src/common/debug-model.ts index 0f23d5d544fc5..100e5eac00264 100644 --- a/packages/debug/src/common/debug-model.ts +++ b/packages/debug/src/common/debug-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/common/debug-service.ts b/packages/debug/src/common/debug-service.ts index 52077893316ac..87d4059f582b1 100644 --- a/packages/debug/src/common/debug-service.ts +++ b/packages/debug/src/common/debug-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Channel, Disposable, Emitter, Event } from '@theia/core'; diff --git a/packages/debug/src/common/debug-uri-utils.ts b/packages/debug/src/common/debug-uri-utils.ts index 107687cddb5ef..11c89494a60b3 100644 --- a/packages/debug/src/common/debug-uri-utils.ts +++ b/packages/debug/src/common/debug-uri-utils.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /** diff --git a/packages/debug/src/common/inline-debug-adapter.ts b/packages/debug/src/common/inline-debug-adapter.ts index 486917e2d2e65..f2e5359453702 100644 --- a/packages/debug/src/common/inline-debug-adapter.ts +++ b/packages/debug/src/common/inline-debug-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter, Event } from '@theia/core/lib/common/event'; diff --git a/packages/debug/src/node/debug-adapter-factory.ts b/packages/debug/src/node/debug-adapter-factory.ts index b4d15c0805ad8..47606579286e8 100644 --- a/packages/debug/src/node/debug-adapter-factory.ts +++ b/packages/debug/src/node/debug-adapter-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/debug/src/node/debug-adapter-session-manager.ts b/packages/debug/src/node/debug-adapter-session-manager.ts index 944058741389a..ff4290e73eae7 100644 --- a/packages/debug/src/node/debug-adapter-session-manager.ts +++ b/packages/debug/src/node/debug-adapter-session-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { UUID } from '@theia/core/shared/@phosphor/coreutils'; diff --git a/packages/debug/src/node/debug-backend-module.ts b/packages/debug/src/node/debug-backend-module.ts index 32e90d0bf68dd..20e841ed8ac42 100644 --- a/packages/debug/src/node/debug-backend-module.ts +++ b/packages/debug/src/node/debug-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { bindContributionProvider, ILogger } from '@theia/core/lib/common'; diff --git a/packages/debug/src/node/debug-service-impl.ts b/packages/debug/src/node/debug-service-impl.ts index f5e1e6aa1e054..35edd7adffa57 100644 --- a/packages/debug/src/node/debug-service-impl.ts +++ b/packages/debug/src/node/debug-service-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/debug/src/node/stream-debug-adapter.ts b/packages/debug/src/node/stream-debug-adapter.ts index 34775f3c909ea..d9162ba0fa0e9 100644 --- a/packages/debug/src/node/stream-debug-adapter.ts +++ b/packages/debug/src/node/stream-debug-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DisposableCollection } from '@theia/core/lib/common/disposable'; diff --git a/packages/debug/src/node/vscode/vscode-debug-adapter-contribution.ts b/packages/debug/src/node/vscode/vscode-debug-adapter-contribution.ts index 1d3edafe71f5b..65c3589476d97 100644 --- a/packages/debug/src/node/vscode/vscode-debug-adapter-contribution.ts +++ b/packages/debug/src/node/vscode/vscode-debug-adapter-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @theia/localization-check */ diff --git a/packages/editor-preview/package.json b/packages/editor-preview/package.json index 8d39b80fece90..965960a56c7ee 100644 --- a/packages/editor-preview/package.json +++ b/packages/editor-preview/package.json @@ -18,7 +18,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/editor-preview/src/browser/editor-preview-contribution.ts b/packages/editor-preview/src/browser/editor-preview-contribution.ts index de79ef37808de..95c17c67d3b1a 100644 --- a/packages/editor-preview/src/browser/editor-preview-contribution.ts +++ b/packages/editor-preview/src/browser/editor-preview-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ApplicationShell, CommonCommands, KeybindingContribution, KeybindingRegistry, SHELL_TABBAR_CONTEXT_PIN, Widget } from '@theia/core/lib/browser'; diff --git a/packages/editor-preview/src/browser/editor-preview-frontend-module.ts b/packages/editor-preview/src/browser/editor-preview-frontend-module.ts index cd535f3f7703d..b0e7bb9431f24 100644 --- a/packages/editor-preview/src/browser/editor-preview-frontend-module.ts +++ b/packages/editor-preview/src/browser/editor-preview-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/editor-preview/src/browser/editor-preview-manager.ts b/packages/editor-preview/src/browser/editor-preview-manager.ts index ca401f7ac5d16..d2679b6afecf0 100644 --- a/packages/editor-preview/src/browser/editor-preview-manager.ts +++ b/packages/editor-preview/src/browser/editor-preview-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { EditorManager, EditorOpenerOptions, EditorWidget } from '@theia/editor/lib/browser'; diff --git a/packages/editor-preview/src/browser/editor-preview-preferences.ts b/packages/editor-preview/src/browser/editor-preview-preferences.ts index 11a71aa1ce1f3..071a23f460179 100644 --- a/packages/editor-preview/src/browser/editor-preview-preferences.ts +++ b/packages/editor-preview/src/browser/editor-preview-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts b/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts index c0307e70cca94..21c6671cee3ca 100644 --- a/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts +++ b/packages/editor-preview/src/browser/editor-preview-tree-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor-preview/src/browser/editor-preview-widget-factory.ts b/packages/editor-preview/src/browser/editor-preview-widget-factory.ts index 4c06a985a423a..05afd8c6be726 100644 --- a/packages/editor-preview/src/browser/editor-preview-widget-factory.ts +++ b/packages/editor-preview/src/browser/editor-preview-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/editor-preview/src/browser/editor-preview-widget.ts b/packages/editor-preview/src/browser/editor-preview-widget.ts index 9d2002f34f554..d0ff62e312bc2 100644 --- a/packages/editor-preview/src/browser/editor-preview-widget.ts +++ b/packages/editor-preview/src/browser/editor-preview-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TabBar, Widget, PINNED_CLASS } from '@theia/core/lib/browser'; diff --git a/packages/editor-preview/src/browser/style/editor-preview-widget.css b/packages/editor-preview/src/browser/style/editor-preview-widget.css index 3ddd522a6c67c..16cf4abeda1d4 100644 --- a/packages/editor-preview/src/browser/style/editor-preview-widget.css +++ b/packages/editor-preview/src/browser/style/editor-preview-widget.css @@ -11,11 +11,11 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-editor-preview { - height: 100%; + height: 100%; } .theia-editor-preview-title-unpinned .p-TabBar-tabLabel { diff --git a/packages/editor-preview/src/browser/style/index.css b/packages/editor-preview/src/browser/style/index.css index e6d5be76898a7..f02c20345f638 100644 --- a/packages/editor-preview/src/browser/style/index.css +++ b/packages/editor-preview/src/browser/style/index.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import './editor-preview-widget.css'; +@import "./editor-preview-widget.css"; diff --git a/packages/editor-preview/src/package.spec.ts b/packages/editor-preview/src/package.spec.ts index c04dedd66a33e..ff625cd1f513d 100644 --- a/packages/editor-preview/src/package.spec.ts +++ b/packages/editor-preview/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/editor/package.json b/packages/editor/package.json index 06f50e39d7b56..65102bfa778b6 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -17,7 +17,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/editor/src/browser/decorations/editor-decoration-style.ts b/packages/editor/src/browser/decorations/editor-decoration-style.ts index 0371a9fe3b2da..d6781b5441713 100644 --- a/packages/editor/src/browser/decorations/editor-decoration-style.ts +++ b/packages/editor/src/browser/decorations/editor-decoration-style.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '@theia/core'; diff --git a/packages/editor/src/browser/decorations/editor-decoration.ts b/packages/editor/src/browser/decorations/editor-decoration.ts index c5488eef5ffd7..283cbbb28f70f 100644 --- a/packages/editor/src/browser/decorations/editor-decoration.ts +++ b/packages/editor/src/browser/decorations/editor-decoration.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Range } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/editor/src/browser/decorations/editor-decorator.ts b/packages/editor/src/browser/decorations/editor-decorator.ts index 60603464c4c49..b094b6fc8e6ce 100644 --- a/packages/editor/src/browser/decorations/editor-decorator.ts +++ b/packages/editor/src/browser/decorations/editor-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/decorations/index.ts b/packages/editor/src/browser/decorations/index.ts index 21a5c64bcfce2..c1d9b2bc7b8b5 100644 --- a/packages/editor/src/browser/decorations/index.ts +++ b/packages/editor/src/browser/decorations/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './editor-decoration'; diff --git a/packages/editor/src/browser/diff-navigator.ts b/packages/editor/src/browser/diff-navigator.ts index 376e0fef673ce..71679f9dea2bf 100644 --- a/packages/editor/src/browser/diff-navigator.ts +++ b/packages/editor/src/browser/diff-navigator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TextEditor } from './editor'; diff --git a/packages/editor/src/browser/editor-command.ts b/packages/editor/src/browser/editor-command.ts index 121d028da2308..81e0c1505d02a 100644 --- a/packages/editor/src/browser/editor-command.ts +++ b/packages/editor/src/browser/editor-command.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-contribution.ts b/packages/editor/src/browser/editor-contribution.ts index f53e9578dc203..a51191531fdf4 100644 --- a/packages/editor/src/browser/editor-contribution.ts +++ b/packages/editor/src/browser/editor-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { EditorManager } from './editor-manager'; diff --git a/packages/editor/src/browser/editor-frontend-module.ts b/packages/editor/src/browser/editor-frontend-module.ts index ea9d381ce6918..940e5aa90e9c0 100644 --- a/packages/editor/src/browser/editor-frontend-module.ts +++ b/packages/editor/src/browser/editor-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/editor/src/browser/editor-generated-preference-schema.ts b/packages/editor/src/browser/editor-generated-preference-schema.ts index f775b7ec673a8..f54439039d949 100644 --- a/packages/editor/src/browser/editor-generated-preference-schema.ts +++ b/packages/editor/src/browser/editor-generated-preference-schema.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { isOSX, isWindows, nls } from '@theia/core'; diff --git a/packages/editor/src/browser/editor-keybinding-contexts.ts b/packages/editor/src/browser/editor-keybinding-contexts.ts index d3f5d19920cf7..9d478f5387411 100644 --- a/packages/editor/src/browser/editor-keybinding-contexts.ts +++ b/packages/editor/src/browser/editor-keybinding-contexts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-keybinding.ts b/packages/editor/src/browser/editor-keybinding.ts index 99798b65f0846..5f53350f25265 100644 --- a/packages/editor/src/browser/editor-keybinding.ts +++ b/packages/editor/src/browser/editor-keybinding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-manager.ts b/packages/editor/src/browser/editor-manager.ts index 4ad1043cc8d13..fd99c3b44be36 100644 --- a/packages/editor/src/browser/editor-manager.ts +++ b/packages/editor/src/browser/editor-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-menu.ts b/packages/editor/src/browser/editor-menu.ts index 9a635ca7cf67b..26c3a110def1c 100644 --- a/packages/editor/src/browser/editor-menu.ts +++ b/packages/editor/src/browser/editor-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-navigation-contribution.ts b/packages/editor/src/browser/editor-navigation-contribution.ts index e68c740b1681a..9aa98da47d800 100644 --- a/packages/editor/src/browser/editor-navigation-contribution.ts +++ b/packages/editor/src/browser/editor-navigation-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-preferences.ts b/packages/editor/src/browser/editor-preferences.ts index 78d8fd6180d90..6f0a995847a30 100644 --- a/packages/editor/src/browser/editor-preferences.ts +++ b/packages/editor/src/browser/editor-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-variable-contribution.ts b/packages/editor/src/browser/editor-variable-contribution.ts index 4226c093e22e8..d732f4eeaf337 100644 --- a/packages/editor/src/browser/editor-variable-contribution.ts +++ b/packages/editor/src/browser/editor-variable-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-widget-factory.ts b/packages/editor/src/browser/editor-widget-factory.ts index a015532d23695..0204e6b387634 100644 --- a/packages/editor/src/browser/editor-widget-factory.ts +++ b/packages/editor/src/browser/editor-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/editor-widget.ts b/packages/editor/src/browser/editor-widget.ts index 6181e6ec8a610..708dba0994997 100644 --- a/packages/editor/src/browser/editor-widget.ts +++ b/packages/editor/src/browser/editor-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, SelectionService, Event, UNTITLED_SCHEME, DisposableCollection } from '@theia/core/lib/common'; diff --git a/packages/editor/src/browser/editor.ts b/packages/editor/src/browser/editor.ts index 97367f57f6935..8a425e91970f6 100644 --- a/packages/editor/src/browser/editor.ts +++ b/packages/editor/src/browser/editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Position, Range, Location } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/editor/src/browser/index.ts b/packages/editor/src/browser/index.ts index 28cc78e44267f..02331e1cddde7 100644 --- a/packages/editor/src/browser/index.ts +++ b/packages/editor/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './diff-navigator'; diff --git a/packages/editor/src/browser/language-status/editor-language-status-service.ts b/packages/editor/src/browser/language-status/editor-language-status-service.ts index 0ae67e7779f23..8ffbd70be856e 100644 --- a/packages/editor/src/browser/language-status/editor-language-status-service.ts +++ b/packages/editor/src/browser/language-status/editor-language-status-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/language-status/editor-language-status.css b/packages/editor/src/browser/language-status/editor-language-status.css index 566b919ff1558..0306f177d9a2d 100644 --- a/packages/editor/src/browser/language-status/editor-language-status.css +++ b/packages/editor/src/browser/language-status/editor-language-status.css @@ -11,88 +11,91 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css */ .hover-language-status { - display: flex; - padding: 4px 8px; + display: flex; + padding: 4px 8px; } .hover-language-status:not(:last-child) { - border-bottom: 1px solid var(--theia-notifications-border); + border-bottom: 1px solid var(--theia-notifications-border); } -.hover-language-status>.severity { - padding-right: 8px; - flex: 1; - margin: auto; - display: none; +.hover-language-status > .severity { + padding-right: 8px; + flex: 1; + margin: auto; + display: none; } -.hover-language-status>.severity.sev3 { - color: var(--theia-notificationsErrorIcon-foreground) +.hover-language-status > .severity.sev3 { + color: var(--theia-notificationsErrorIcon-foreground); } -.hover-language-status>.severity.sev2 { - color: var(--theia-notificationsInfoIcon-foreground) +.hover-language-status > .severity.sev2 { + color: var(--theia-notificationsInfoIcon-foreground); } -.hover-language-status>.severity.show { - display: inherit; +.hover-language-status > .severity.show { + display: inherit; } -.hover-language-status>.element { - display: flex; - justify-content: space-between; - vertical-align: middle; - flex-grow: 100; +.hover-language-status > .element { + display: flex; + justify-content: space-between; + vertical-align: middle; + flex-grow: 100; } -.hover-language-status>.element>.left>.detail:not(:empty)::before { - /* en-dash */ - content: '–'; - padding: 0 4px; - opacity: 0.6; +.hover-language-status > .element > .left > .detail:not(:empty)::before { + /* en-dash */ + content: "–"; + padding: 0 4px; + opacity: 0.6; } -.hover-language-status>.element>.left>.label:empty { - display: none; +.hover-language-status > .element > .left > .label:empty { + display: none; } -.hover-language-status>.element .left { - margin: auto 0; +.hover-language-status > .element .left { + margin: auto 0; } -.hover-language-status>.element .right { - margin: auto 0; - display: flex; +.hover-language-status > .element .right { + margin: auto 0; + display: flex; } -.hover-language-status>.element .right:not(:empty) { - padding-left: 16px; +.hover-language-status > .element .right:not(:empty) { + padding-left: 16px; } -.hover-language-status>.element .right .language-status-link { - margin: auto 0; - white-space: nowrap; +.hover-language-status > .element .right .language-status-link { + margin: auto 0; + white-space: nowrap; - /* ADDED STYLES - NOT FROM VSCODE */ - text-decoration: none; + /* ADDED STYLES - NOT FROM VSCODE */ + text-decoration: none; } /* ADDED STYLES - NOT FROM VSCODE */ -.hover-language-status>.element .right .language-status-link:hover { - color: var(--theia-textLink-foreground); +.hover-language-status > .element .right .language-status-link:hover { + color: var(--theia-textLink-foreground); } -.hover-language-status>.element .right .language-status-action-bar:not(:first-child) { - padding-left: 8px; +.hover-language-status + > .element + .right + .language-status-action-bar:not(:first-child) { + padding-left: 8px; } /* ADDED STYLES - NOT FROM VSCODE */ -.hover-language-status>.element .right .language-status-action-bar a { - color: var(--theia-editorHoverWidget-foreground); +.hover-language-status > .element .right .language-status-action-bar a { + color: var(--theia-editorHoverWidget-foreground); } diff --git a/packages/editor/src/browser/navigation/navigation-location-service.spec.ts b/packages/editor/src/browser/navigation/navigation-location-service.spec.ts index 9ed6e492ae7a2..fb750a58dd391 100644 --- a/packages/editor/src/browser/navigation/navigation-location-service.spec.ts +++ b/packages/editor/src/browser/navigation/navigation-location-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/editor/src/browser/navigation/navigation-location-service.ts b/packages/editor/src/browser/navigation/navigation-location-service.ts index 7f05316b91c7b..63544fa6cc72d 100644 --- a/packages/editor/src/browser/navigation/navigation-location-service.ts +++ b/packages/editor/src/browser/navigation/navigation-location-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/navigation/navigation-location-similarity.spec.ts b/packages/editor/src/browser/navigation/navigation-location-similarity.spec.ts index bc04f5c5fde9a..2aa6913d9a04a 100644 --- a/packages/editor/src/browser/navigation/navigation-location-similarity.spec.ts +++ b/packages/editor/src/browser/navigation/navigation-location-similarity.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/editor/src/browser/navigation/navigation-location-similarity.ts b/packages/editor/src/browser/navigation/navigation-location-similarity.ts index 68dd0d41450c9..45405d283b8cb 100644 --- a/packages/editor/src/browser/navigation/navigation-location-similarity.ts +++ b/packages/editor/src/browser/navigation/navigation-location-similarity.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/navigation/navigation-location-updater.spec.ts b/packages/editor/src/browser/navigation/navigation-location-updater.spec.ts index 6cc3446acd819..039d3d850c943 100644 --- a/packages/editor/src/browser/navigation/navigation-location-updater.spec.ts +++ b/packages/editor/src/browser/navigation/navigation-location-updater.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/editor/src/browser/navigation/navigation-location-updater.ts b/packages/editor/src/browser/navigation/navigation-location-updater.ts index 28eff38d9da26..982584685ec07 100644 --- a/packages/editor/src/browser/navigation/navigation-location-updater.ts +++ b/packages/editor/src/browser/navigation/navigation-location-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/navigation/navigation-location.ts b/packages/editor/src/browser/navigation/navigation-location.ts index a304b39cc9688..c7852b395e8e5 100644 --- a/packages/editor/src/browser/navigation/navigation-location.ts +++ b/packages/editor/src/browser/navigation/navigation-location.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/editor/src/browser/navigation/test/mock-navigation-location-updater.ts b/packages/editor/src/browser/navigation/test/mock-navigation-location-updater.ts index 7b1180131108f..db9af1e6cddb7 100644 --- a/packages/editor/src/browser/navigation/test/mock-navigation-location-updater.ts +++ b/packages/editor/src/browser/navigation/test/mock-navigation-location-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Range } from '../navigation-location'; diff --git a/packages/editor/src/browser/quick-editor-service.ts b/packages/editor/src/browser/quick-editor-service.ts index caebb3f96eb79..a766e8cbcc8cf 100644 --- a/packages/editor/src/browser/quick-editor-service.ts +++ b/packages/editor/src/browser/quick-editor-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/editor/src/browser/style/index.css b/packages/editor/src/browser/style/index.css index c7ba75c3011c6..661d9437957c6 100644 --- a/packages/editor/src/browser/style/index.css +++ b/packages/editor/src/browser/style/index.css @@ -11,9 +11,9 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-editor { - height: 100%; + height: 100%; } diff --git a/packages/editor/src/common/language-selector.ts b/packages/editor/src/common/language-selector.ts index e767adcc3b823..b9da89de8d925 100644 --- a/packages/editor/src/common/language-selector.ts +++ b/packages/editor/src/common/language-selector.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { match as matchGlobPattern } from '@theia/core/lib/common/glob'; diff --git a/packages/editor/src/package.spec.ts b/packages/editor/src/package.spec.ts index 5787947bc7136..62bfd7486bddb 100644 --- a/packages/editor/src/package.spec.ts +++ b/packages/editor/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/electron/index.d.ts b/packages/electron/index.d.ts index e5e8dad383bcf..78f572c6dd522 100644 --- a/packages/electron/index.d.ts +++ b/packages/electron/index.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/electron/index.js b/packages/electron/index.js index 75f0cdc854900..6bf8d88e90710 100644 --- a/packages/electron/index.js +++ b/packages/electron/index.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/packages/electron/package.json b/packages/electron/package.json index 7e109bb2d8052..441dcbac308c0 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -33,7 +33,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/external-terminal/package.json b/packages/external-terminal/package.json index 85ece1d3590a5..530d03e42e759 100644 --- a/packages/external-terminal/package.json +++ b/packages/external-terminal/package.json @@ -19,7 +19,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/external-terminal/src/common/external-terminal.ts b/packages/external-terminal/src/common/external-terminal.ts index da86ebd7536a6..523baf2b5b10a 100644 --- a/packages/external-terminal/src/common/external-terminal.ts +++ b/packages/external-terminal/src/common/external-terminal.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const ExternalTerminalService = Symbol('ExternalTerminalService'); diff --git a/packages/external-terminal/src/electron-browser/external-terminal-contribution.ts b/packages/external-terminal/src/electron-browser/external-terminal-contribution.ts index 83ec64216b158..86b158fe7a2e6 100644 --- a/packages/external-terminal/src/electron-browser/external-terminal-contribution.ts +++ b/packages/external-terminal/src/electron-browser/external-terminal-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/external-terminal/src/electron-browser/external-terminal-frontend-module.ts b/packages/external-terminal/src/electron-browser/external-terminal-frontend-module.ts index 721181ce2b63d..dc99255de9db9 100644 --- a/packages/external-terminal/src/electron-browser/external-terminal-frontend-module.ts +++ b/packages/external-terminal/src/electron-browser/external-terminal-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/external-terminal/src/electron-browser/external-terminal-preference.ts b/packages/external-terminal/src/electron-browser/external-terminal-preference.ts index c98a8f50de013..8502b471878a5 100644 --- a/packages/external-terminal/src/electron-browser/external-terminal-preference.ts +++ b/packages/external-terminal/src/electron-browser/external-terminal-preference.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/external-terminal/src/electron-node/external-terminal-backend-module.ts b/packages/external-terminal/src/electron-node/external-terminal-backend-module.ts index 16ed5ef0798bf..52913477e2143 100644 --- a/packages/external-terminal/src/electron-node/external-terminal-backend-module.ts +++ b/packages/external-terminal/src/electron-node/external-terminal-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/external-terminal/src/electron-node/linux-external-terminal-service.ts b/packages/external-terminal/src/electron-node/linux-external-terminal-service.ts index edbbaac5ec8ee..44180a1fa1743 100644 --- a/packages/external-terminal/src/electron-node/linux-external-terminal-service.ts +++ b/packages/external-terminal/src/electron-node/linux-external-terminal-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/external-terminal/src/electron-node/mac-external-terminal-service.ts b/packages/external-terminal/src/electron-node/mac-external-terminal-service.ts index c4b25b561bb91..9dd06d706fb89 100644 --- a/packages/external-terminal/src/electron-node/mac-external-terminal-service.ts +++ b/packages/external-terminal/src/electron-node/mac-external-terminal-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/external-terminal/src/electron-node/windows-external-terminal-service.ts b/packages/external-terminal/src/electron-node/windows-external-terminal-service.ts index 81f5250049d4b..d169339c38e95 100644 --- a/packages/external-terminal/src/electron-node/windows-external-terminal-service.ts +++ b/packages/external-terminal/src/electron-node/windows-external-terminal-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/external-terminal/src/package.spec.ts b/packages/external-terminal/src/package.spec.ts index 0d5d1f0fe5685..f862ab86b258b 100644 --- a/packages/external-terminal/src/package.spec.ts +++ b/packages/external-terminal/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that @@ -24,6 +24,6 @@ describe('external-terminal package', () => { - it('support code coverage statistics', () => true); + it('support code coverage statistics', () => true); }); diff --git a/packages/file-search/package.json b/packages/file-search/package.json index ec8a043ced7e3..efd2bec52ec98 100644 --- a/packages/file-search/package.json +++ b/packages/file-search/package.json @@ -22,7 +22,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/file-search/src/browser/file-search-frontend-module.ts b/packages/file-search/src/browser/file-search-frontend-module.ts index f57346e3f0c69..b6b3380ac4231 100644 --- a/packages/file-search/src/browser/file-search-frontend-module.ts +++ b/packages/file-search/src/browser/file-search-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/file-search/src/browser/quick-file-open-contribution.ts b/packages/file-search/src/browser/quick-file-open-contribution.ts index 233cdb0fef9ca..12d7bf65ce2f0 100644 --- a/packages/file-search/src/browser/quick-file-open-contribution.ts +++ b/packages/file-search/src/browser/quick-file-open-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/file-search/src/browser/quick-file-open.ts b/packages/file-search/src/browser/quick-file-open.ts index 4b136d548c7a8..b8acb3a96cf8d 100644 --- a/packages/file-search/src/browser/quick-file-open.ts +++ b/packages/file-search/src/browser/quick-file-open.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/file-search/src/common/file-search-service.ts b/packages/file-search/src/common/file-search-service.ts index e3d5b17c9b4a3..1339c0ef243ea 100644 --- a/packages/file-search/src/common/file-search-service.ts +++ b/packages/file-search/src/common/file-search-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CancellationToken } from '@theia/core'; diff --git a/packages/file-search/src/node/file-search-backend-module.ts b/packages/file-search/src/node/file-search-backend-module.ts index 3a3b48fb71e34..a3f7f00c31a80 100644 --- a/packages/file-search/src/node/file-search-backend-module.ts +++ b/packages/file-search/src/node/file-search-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/file-search/src/node/file-search-service-impl.spec.ts b/packages/file-search/src/node/file-search-service-impl.spec.ts index 0c40b31d698e8..f89ef794af0b1 100644 --- a/packages/file-search/src/node/file-search-service-impl.spec.ts +++ b/packages/file-search/src/node/file-search-service-impl.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/file-search/src/node/file-search-service-impl.ts b/packages/file-search/src/node/file-search-service-impl.ts index 1d98bc5590af2..8169a5077b788 100644 --- a/packages/file-search/src/node/file-search-service-impl.ts +++ b/packages/file-search/src/node/file-search-service-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as cp from 'child_process'; diff --git a/packages/filesystem/package.json b/packages/filesystem/package.json index 85c83e5623f06..bc922e88ae005 100644 --- a/packages/filesystem/package.json +++ b/packages/filesystem/package.json @@ -44,7 +44,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumb.ts b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumb.ts index 615053a3abb28..0b2ae94556ee1 100644 --- a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumb.ts +++ b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumb.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts index 792a59dbd6424..fcac2093907e1 100644 --- a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts +++ b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, interfaces, injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-contribution.ts b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-contribution.ts index 7fb5d136deede..aebde453d45bc 100644 --- a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-contribution.ts +++ b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, Emitter, Event } from '@theia/core'; diff --git a/packages/filesystem/src/browser/download/file-download-command-contribution.ts b/packages/filesystem/src/browser/download/file-download-command-contribution.ts index 58c85607131a9..9bcfb72bdd349 100644 --- a/packages/filesystem/src/browser/download/file-download-command-contribution.ts +++ b/packages/filesystem/src/browser/download/file-download-command-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/download/file-download-frontend-module.ts b/packages/filesystem/src/browser/download/file-download-frontend-module.ts index 3d9396ea604ed..8e8b318ef2ff6 100644 --- a/packages/filesystem/src/browser/download/file-download-frontend-module.ts +++ b/packages/filesystem/src/browser/download/file-download-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/download/file-download-service.ts b/packages/filesystem/src/browser/download/file-download-service.ts index 1a31286acc5cf..9df5fa46df400 100644 --- a/packages/filesystem/src/browser/download/file-download-service.ts +++ b/packages/filesystem/src/browser/download/file-download-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-container.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-container.ts index 340be961caf5d..ac8b333283104 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-container.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-hidden-files-renderer.tsx b/packages/filesystem/src/browser/file-dialog/file-dialog-hidden-files-renderer.tsx index 01d7d74fa9a11..948579541e19e 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-hidden-files-renderer.tsx +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-hidden-files-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-model.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-model.ts index 166cbe79b4606..62878c6af693e 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-model.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-module.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-module.ts index 2565b88db0e56..0fcf9630ee893 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-module.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts index 9626640c093d9..a6c9f8ce28565 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx b/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx index ebaddd3c8429b..f04787464ec50 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-tree-filters-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-tree.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-tree.ts index 368fcc18137b5..0a5918298486e 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-tree.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts index 5bce7dbce585e..fb52307421fe8 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog.ts b/packages/filesystem/src/browser/file-dialog/file-dialog.ts index 32a160f96c71f..ab9ece4eb044b 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-dialog/index.ts b/packages/filesystem/src/browser/file-dialog/index.ts index 585a3f9a5748b..d0b07676016a6 100644 --- a/packages/filesystem/src/browser/file-dialog/index.ts +++ b/packages/filesystem/src/browser/file-dialog/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './file-dialog'; diff --git a/packages/filesystem/src/browser/file-resource.ts b/packages/filesystem/src/browser/file-resource.ts index 2db117ac45113..ef515c4a31ff3 100644 --- a/packages/filesystem/src/browser/file-resource.ts +++ b/packages/filesystem/src/browser/file-resource.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-selection.ts b/packages/filesystem/src/browser/file-selection.ts index fa98c3ef80086..4a70b6e17d82c 100644 --- a/packages/filesystem/src/browser/file-selection.ts +++ b/packages/filesystem/src/browser/file-selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SelectionService } from '@theia/core/lib/common/selection-service'; diff --git a/packages/filesystem/src/browser/file-service.ts b/packages/filesystem/src/browser/file-service.ts index a7fb8a3dd8b48..bf3bea1404fca 100644 --- a/packages/filesystem/src/browser/file-service.ts +++ b/packages/filesystem/src/browser/file-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/filesystem/src/browser/file-tree/file-tree-container.ts b/packages/filesystem/src/browser/file-tree/file-tree-container.ts index 6a1371f7a96d5..c8ec70015a7e0 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-container.ts +++ b/packages/filesystem/src/browser/file-tree/file-tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-tree/file-tree-decorator-adapter.ts b/packages/filesystem/src/browser/file-tree/file-tree-decorator-adapter.ts index 8c43aab0fbfcb..1baa00b0caee9 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-decorator-adapter.ts +++ b/packages/filesystem/src/browser/file-tree/file-tree-decorator-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-tree/file-tree-label-provider.ts b/packages/filesystem/src/browser/file-tree/file-tree-label-provider.ts index 38d78c02fb690..aac8e89859d67 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-label-provider.ts +++ b/packages/filesystem/src/browser/file-tree/file-tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-tree/file-tree-model.ts b/packages/filesystem/src/browser/file-tree/file-tree-model.ts index 69a21f2644b45..05dead78f8d69 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-model.ts +++ b/packages/filesystem/src/browser/file-tree/file-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx b/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx index 845d1b738eec6..f8d64c182ec67 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx +++ b/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/filesystem/src/browser/file-tree/file-tree.ts b/packages/filesystem/src/browser/file-tree/file-tree.ts index f6401fc4320bf..9bf602fa2c8ab 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree.ts +++ b/packages/filesystem/src/browser/file-tree/file-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/file-tree/index.ts b/packages/filesystem/src/browser/file-tree/index.ts index 911e07c856175..287c23329d8c4 100644 --- a/packages/filesystem/src/browser/file-tree/index.ts +++ b/packages/filesystem/src/browser/file-tree/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './file-tree'; diff --git a/packages/filesystem/src/browser/file-upload-service.ts b/packages/filesystem/src/browser/file-upload-service.ts index 7963856aa0ad6..66fdf2838dfeb 100644 --- a/packages/filesystem/src/browser/file-upload-service.ts +++ b/packages/filesystem/src/browser/file-upload-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/filesystem/src/browser/filesystem-frontend-contribution.ts b/packages/filesystem/src/browser/filesystem-frontend-contribution.ts index f6ecf4f406224..13917733ec2c5 100644 --- a/packages/filesystem/src/browser/filesystem-frontend-contribution.ts +++ b/packages/filesystem/src/browser/filesystem-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/filesystem-frontend-module.ts b/packages/filesystem/src/browser/filesystem-frontend-module.ts index de70799a0f165..c15fad6790a11 100644 --- a/packages/filesystem/src/browser/filesystem-frontend-module.ts +++ b/packages/filesystem/src/browser/filesystem-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/filesystem/src/browser/filesystem-preferences.ts b/packages/filesystem/src/browser/filesystem-preferences.ts index 9a8697b389e52..99a1f2fcbc58d 100644 --- a/packages/filesystem/src/browser/filesystem-preferences.ts +++ b/packages/filesystem/src/browser/filesystem-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/filesystem-save-resource-service.ts b/packages/filesystem/src/browser/filesystem-save-resource-service.ts index 6a1545c7b7de3..d35d772293296 100644 --- a/packages/filesystem/src/browser/filesystem-save-resource-service.ts +++ b/packages/filesystem/src/browser/filesystem-save-resource-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { environment, nls } from '@theia/core'; diff --git a/packages/filesystem/src/browser/filesystem-watcher-error-handler.ts b/packages/filesystem/src/browser/filesystem-watcher-error-handler.ts index 69234fa460197..ec4a5cc6abe8f 100644 --- a/packages/filesystem/src/browser/filesystem-watcher-error-handler.ts +++ b/packages/filesystem/src/browser/filesystem-watcher-error-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/index.ts b/packages/filesystem/src/browser/index.ts index 9c06fca694346..fe9536d4e5bc8 100644 --- a/packages/filesystem/src/browser/index.ts +++ b/packages/filesystem/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './location'; diff --git a/packages/filesystem/src/browser/location/index.ts b/packages/filesystem/src/browser/location/index.ts index 589a034c535aa..96e624540db8d 100644 --- a/packages/filesystem/src/browser/location/index.ts +++ b/packages/filesystem/src/browser/location/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './location-service'; diff --git a/packages/filesystem/src/browser/location/location-renderer.tsx b/packages/filesystem/src/browser/location/location-renderer.tsx index 9cf085756f0d8..bf89c946fb7c5 100644 --- a/packages/filesystem/src/browser/location/location-renderer.tsx +++ b/packages/filesystem/src/browser/location/location-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/filesystem/src/browser/location/location-service.ts b/packages/filesystem/src/browser/location/location-service.ts index fa9a227a900c5..7c39015a2ae4e 100644 --- a/packages/filesystem/src/browser/location/location-service.ts +++ b/packages/filesystem/src/browser/location/location-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/filesystem/src/browser/remote-file-service-contribution.ts b/packages/filesystem/src/browser/remote-file-service-contribution.ts index b78d1d2dfe7c1..33c8225c5d815 100644 --- a/packages/filesystem/src/browser/remote-file-service-contribution.ts +++ b/packages/filesystem/src/browser/remote-file-service-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/browser/style/file-dialog.css b/packages/filesystem/src/browser/style/file-dialog.css index b4b46420edd43..78e3084b4ae96 100644 --- a/packages/filesystem/src/browser/style/file-dialog.css +++ b/packages/filesystem/src/browser/style/file-dialog.css @@ -11,54 +11,53 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-private-file-dialog-input-height: 21px; - --theia-private-location-list-panel-left: 92px; - --theia-private-location-list-panel-width: 407px; - --theia-private-navigation-panel-icon-size: 21px; - --theia-private-navigation-panel-line-height: 23px; + --theia-private-file-dialog-input-height: 21px; + --theia-private-location-list-panel-left: 92px; + --theia-private-location-list-panel-width: 407px; + --theia-private-navigation-panel-icon-size: 21px; + --theia-private-navigation-panel-line-height: 23px; } - /* +/* * Open and Save file dialogs */ .dialogContent .theia-FileDialog, .dialogContent .theia-SaveFileDialog, .dialogContent .theia-ResponsiveFileDialog { - height: 500px; - width: 500px; - border: 1px solid var(--theia-editorWidget-border); - background: var(--theia-dropdown-background); + height: 500px; + width: 500px; + border: 1px solid var(--theia-editorWidget-border); + background: var(--theia-dropdown-background); } - @media only screen and (max-height: 700px) { - .dialogContent .theia-FileDialog, - .dialogContent .theia-SaveFileDialog, - .dialogContent .theia-ResponsiveFileDialog { - height: 300px; - } + .dialogContent .theia-FileDialog, + .dialogContent .theia-SaveFileDialog, + .dialogContent .theia-ResponsiveFileDialog { + height: 300px; + } } .dialogContent .theia-NavigationPanel, .dialogContent .theia-FiltersPanel, .dialogContent .theia-FileNamePanel { - display: block; - position: relative; - overflow: hidden; + display: block; + position: relative; + overflow: hidden; } .dialogContent .theia-NavigationPanel, .dialogContent .theia-FiltersPanel { - min-height: 27px; + min-height: 27px; } .dialogContent .theia-FileNamePanel { - height: 31px; + height: 31px; } /* @@ -66,86 +65,84 @@ */ .dialogContent .theia-NavigationPanel span { - position: absolute; - top: 2px; - line-height: var(--theia-private-navigation-panel-line-height); - cursor: pointer; - width: var(--theia-private-navigation-panel-icon-size); - text-align: center; + position: absolute; + top: 2px; + line-height: var(--theia-private-navigation-panel-line-height); + cursor: pointer; + width: var(--theia-private-navigation-panel-icon-size); + text-align: center; } .dialogContent .theia-NavigationPanel span:focus { - outline: none; - box-shadow: none; + outline: none; + box-shadow: none; } .dialogContent .theia-NavigationPanel span:focus-visible { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1 !important; - outline-color: var(--theia-focusBorder); + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + opacity: 1 !important; + outline-color: var(--theia-focusBorder); } .dialogContent span.theia-mod-disabled { - pointer-events: none; - cursor: default; + pointer-events: none; + cursor: default; } .dialogContent span.theia-mod-disabled .action-label { - background: none; + background: none; } .dialogContent .theia-NavigationBack { - left: auto; + left: auto; } .dialogContent .theia-NavigationForward { - left: 23px; + left: 23px; } .dialogContent .theia-NavigationHome { - left: 45px; + left: 45px; } .dialogContent .theia-NavigationUp { - left: 67px; + left: 67px; } .dialogContent .theia-LocationListPanel { - position: absolute; - display: flex; - top: 1px; - left: var(--theia-private-location-list-panel-left); - width: var(--theia-private-location-list-panel-width); - height: var(--theia-private-file-dialog-input-height); + position: absolute; + display: flex; + top: 1px; + left: var(--theia-private-location-list-panel-left); + width: var(--theia-private-location-list-panel-width); + height: var(--theia-private-file-dialog-input-height); } .dialogContent .theia-LocationInputToggle { - text-align: center; - left: 0; - width: var(--theia-private-navigation-panel-icon-size); - height: var(--theia-private-navigation-panel-icon-size); - z-index: 1; + text-align: center; + left: 0; + width: var(--theia-private-navigation-panel-icon-size); + height: var(--theia-private-navigation-panel-icon-size); + z-index: 1; } .dialogContent .theia-LocationList, -.dialogContent .theia-LocationTextInput -{ - box-sizing: content-box; - padding: unset; - position: absolute; - top: 0; - left: 0; - height: var(--theia-private-file-dialog-input-height); - border: var(--theia-border-width) solid var(--theia-input-border); +.dialogContent .theia-LocationTextInput { + box-sizing: content-box; + padding: unset; + position: absolute; + top: 0; + left: 0; + height: var(--theia-private-file-dialog-input-height); + border: var(--theia-border-width) solid var(--theia-input-border); } .dialogContent .theia-LocationList, -.dialogContent .theia-LocationTextInput -{ - padding-left: var(--theia-private-navigation-panel-icon-size); - width: calc(100% - var(--theia-private-navigation-panel-icon-size)); +.dialogContent .theia-LocationTextInput { + padding-left: var(--theia-private-navigation-panel-icon-size); + width: calc(100% - var(--theia-private-navigation-panel-icon-size)); } /* @@ -153,21 +150,21 @@ */ .dialogContent .theia-FiltersLabel { - position: absolute; - left: 1px; - top: 0px; - line-height: 27px; + position: absolute; + left: 1px; + top: 0px; + line-height: 27px; } .dialogContent .theia-FiltersListPanel { - position: absolute; - left: 72px; - top: 3px; + position: absolute; + left: 72px; + top: 3px; } .dialogContent .theia-FileTreeFiltersList { - width: 427px; - height: var(--theia-private-file-dialog-input-height); + width: 427px; + height: var(--theia-private-file-dialog-input-height); } /* @@ -175,17 +172,17 @@ */ .dialogContent .theia-FileNameLabel { - position: absolute; - left: 1px; - top: 0px; - line-height: 23px; + position: absolute; + left: 1px; + top: 0px; + line-height: 23px; } .dialogContent .theia-FileNameTextField { - position: absolute; - left: 72px; - top: 0px; - width: 420px; + position: absolute; + left: 72px; + top: 0px; + width: 420px; } /* @@ -193,19 +190,19 @@ */ .dialogContent .theia-ControlPanel { - display: flex; - flex-direction: row; - justify-content: flex-end; - margin-bottom: 0px; + display: flex; + flex-direction: row; + justify-content: flex-end; + margin-bottom: 0px; } .dialogContent .theia-ControlPanel > * { - margin-left: 4px; + margin-left: 4px; } .dialogContent .theia-ToggleHiddenInputContainer { - display: flex; - justify-content: flex-end; - align-items: center; - padding-top: var(--theia-ui-padding); + display: flex; + justify-content: flex-end; + align-items: center; + padding-top: var(--theia-ui-padding); } diff --git a/packages/filesystem/src/browser/style/file-icons.css b/packages/filesystem/src/browser/style/file-icons.css index e13d63fad78ae..efbc614c3a457 100644 --- a/packages/filesystem/src/browser/style/file-icons.css +++ b/packages/filesystem/src/browser/style/file-icons.css @@ -11,54 +11,54 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ - .theia-file-icons-js { - /* +.theia-file-icons-js { + /* Here, the `line-height` ensures that FontAwesome and `file-icons-js` container has the same height. Ideally, it would be 1 em, but since we set the max height above (and other places too) with 0.8 multiplier, we use 0.8 em here too. */ - line-height: 0.8em; + line-height: 0.8em; } .theia-file-icons-js:before { - font-size: calc(var(--theia-content-font-size) * 0.8); + font-size: calc(var(--theia-content-font-size) * 0.8); } .p-TabBar-tabIcon.theia-file-icons-js.file-icon { - padding-left: 1px !important; - padding-right: 3px !important; + padding-left: 1px !important; + padding-right: 3px !important; } .theia-file-icons-js.file-icon { - min-width: var(--theia-icon-size); - display: flex; - justify-content: center; - align-items: center; - padding-left: 2px; - padding-right: 4px; + min-width: var(--theia-icon-size); + display: flex; + justify-content: center; + align-items: center; + padding-left: 2px; + padding-right: 4px; } .default-folder-icon, .default-file-icon { - padding-right: 6px; + padding-right: 6px; } .fa-file:before, .fa-folder:before, .theia-file-icons-js:before { - text-align: center; - margin-right: 4px; + text-align: center; + margin-right: 4px; } .theia-app-sides .theia-file-icons-js { - max-height: none; - line-height: inherit; + max-height: none; + line-height: inherit; } .theia-app-sides .theia-file-icons-js:before { - font-size: var(--theia-private-sidebar-icon-size); - margin-right: 0px; + font-size: var(--theia-private-sidebar-icon-size); + margin-right: 0px; } diff --git a/packages/filesystem/src/browser/style/filepath-breadcrumbs.css b/packages/filesystem/src/browser/style/filepath-breadcrumbs.css index 6c15e0ff49ee3..5311d75468c03 100644 --- a/packages/filesystem/src/browser/style/filepath-breadcrumbs.css +++ b/packages/filesystem/src/browser/style/filepath-breadcrumbs.css @@ -11,10 +11,10 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-FilepathBreadcrumbFileTree { - height: auto; - max-height: 200px; + height: auto; + max-height: 200px; } diff --git a/packages/filesystem/src/browser/style/index.css b/packages/filesystem/src/browser/style/index.css index fdde513b3daf5..4653a78ed7573 100644 --- a/packages/filesystem/src/browser/style/index.css +++ b/packages/filesystem/src/browser/style/index.css @@ -11,12 +11,12 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import './file-dialog.css'; -@import './file-icons.css'; -@import './filepath-breadcrumbs.css'; +@import "./file-dialog.css"; +@import "./file-icons.css"; +@import "./filepath-breadcrumbs.css"; .theia-file-tree-drag-image { position: absolute; @@ -26,7 +26,7 @@ top: -1000px; font-size: var(--theia-ui-font-size1); display: inline-block; - padding: 1px calc(var(--theia-ui-padding)*2); + padding: 1px calc(var(--theia-ui-padding) * 2); border-radius: 10px; background: var(--theia-list-activeSelectionBackground); diff --git a/packages/filesystem/src/common/delegating-file-system-provider.ts b/packages/filesystem/src/common/delegating-file-system-provider.ts index 07647a0ebf602..5e987d1eaa0a0 100644 --- a/packages/filesystem/src/common/delegating-file-system-provider.ts +++ b/packages/filesystem/src/common/delegating-file-system-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/filesystem/src/common/download/file-download-data.ts b/packages/filesystem/src/common/download/file-download-data.ts index 90ac52104a4b1..2b021aac9fd77 100644 --- a/packages/filesystem/src/common/download/file-download-data.ts +++ b/packages/filesystem/src/common/download/file-download-data.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from '@theia/core/lib/common'; diff --git a/packages/filesystem/src/common/file-upload.ts b/packages/filesystem/src/common/file-upload.ts index 4375ddf499e1e..2fb7c0f65780b 100644 --- a/packages/filesystem/src/common/file-upload.ts +++ b/packages/filesystem/src/common/file-upload.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const HTTP_FILE_UPLOAD_PATH = '/file-upload'; diff --git a/packages/filesystem/src/common/files.spec.ts b/packages/filesystem/src/common/files.spec.ts index cdce2493573c9..415c04d9752a3 100644 --- a/packages/filesystem/src/common/files.spec.ts +++ b/packages/filesystem/src/common/files.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FileChangesEvent, FileChangeType } from './files'; diff --git a/packages/filesystem/src/common/files.ts b/packages/filesystem/src/common/files.ts index cd7a5eef98d42..865a680c0b113 100644 --- a/packages/filesystem/src/common/files.ts +++ b/packages/filesystem/src/common/files.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/filesystem/src/common/filesystem-utils.spec.ts b/packages/filesystem/src/common/filesystem-utils.spec.ts index 7d85d72ab2923..9a72dc8460d1b 100644 --- a/packages/filesystem/src/common/filesystem-utils.spec.ts +++ b/packages/filesystem/src/common/filesystem-utils.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FileStat } from './files'; diff --git a/packages/filesystem/src/common/filesystem-utils.ts b/packages/filesystem/src/common/filesystem-utils.ts index 9baa30c7f2b92..990a74809a458 100644 --- a/packages/filesystem/src/common/filesystem-utils.ts +++ b/packages/filesystem/src/common/filesystem-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FileStat } from '../common/files'; diff --git a/packages/filesystem/src/common/filesystem-watcher-protocol.ts b/packages/filesystem/src/common/filesystem-watcher-protocol.ts index facc5fcf1e204..146f98a0022d9 100644 --- a/packages/filesystem/src/common/filesystem-watcher-protocol.ts +++ b/packages/filesystem/src/common/filesystem-watcher-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core'; diff --git a/packages/filesystem/src/common/filesystem.ts b/packages/filesystem/src/common/filesystem.ts index 91ca6b7b0e47c..9e556991f62bf 100644 --- a/packages/filesystem/src/common/filesystem.ts +++ b/packages/filesystem/src/common/filesystem.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace FileAccess { diff --git a/packages/filesystem/src/common/index.ts b/packages/filesystem/src/common/index.ts index c941d7696fb06..1ac753a78bdee 100644 --- a/packages/filesystem/src/common/index.ts +++ b/packages/filesystem/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './filesystem'; diff --git a/packages/filesystem/src/common/io.ts b/packages/filesystem/src/common/io.ts index a16f87eabcd74..e13ac65c72a20 100644 --- a/packages/filesystem/src/common/io.ts +++ b/packages/filesystem/src/common/io.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/filesystem/src/common/remote-file-system-provider.ts b/packages/filesystem/src/common/remote-file-system-provider.ts index e3c842d4ebf83..257af0a2cd35d 100644 --- a/packages/filesystem/src/common/remote-file-system-provider.ts +++ b/packages/filesystem/src/common/remote-file-system-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-module.ts b/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-module.ts index 72b7ea9d14019..42b5dd29fb6f9 100644 --- a/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-module.ts +++ b/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts b/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts index 12dab8403db04..abb9c57372cb8 100644 --- a/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts +++ b/packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/electron-browser/preload.ts b/packages/filesystem/src/electron-browser/preload.ts index 73536c6a41f1a..7a5f0d3ffd400 100644 --- a/packages/filesystem/src/electron-browser/preload.ts +++ b/packages/filesystem/src/electron-browser/preload.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CHANNEL_SHOW_OPEN, CHANNEL_SHOW_SAVE, OpenDialogOptions, SaveDialogOptions, TheiaFilesystemAPI } from '../electron-common/electron-api'; diff --git a/packages/filesystem/src/electron-common/electron-api.ts b/packages/filesystem/src/electron-common/electron-api.ts index 4441d1cb38bd7..59d59d3a14403 100644 --- a/packages/filesystem/src/electron-common/electron-api.ts +++ b/packages/filesystem/src/electron-common/electron-api.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface FileFilter { diff --git a/packages/filesystem/src/electron-main/electron-api-main.ts b/packages/filesystem/src/electron-main/electron-api-main.ts index 831cae881607b..0a9d6576a09b2 100644 --- a/packages/filesystem/src/electron-main/electron-api-main.ts +++ b/packages/filesystem/src/electron-main/electron-api-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/electron-main/electron-main-module.ts b/packages/filesystem/src/electron-main/electron-main-module.ts index ffb2f4dcd2808..639a02980c994 100644 --- a/packages/filesystem/src/electron-main/electron-main-module.ts +++ b/packages/filesystem/src/electron-main/electron-main-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; import { ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application'; diff --git a/packages/filesystem/src/node/disk-file-system-provider.ts b/packages/filesystem/src/node/disk-file-system-provider.ts index 1144d4b8ecd75..913f0479b2192 100644 --- a/packages/filesystem/src/node/disk-file-system-provider.ts +++ b/packages/filesystem/src/node/disk-file-system-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/filesystem/src/node/download/directory-archiver.spec.ts b/packages/filesystem/src/node/download/directory-archiver.spec.ts index 094f4d36f710e..a1c1e2c410c21 100644 --- a/packages/filesystem/src/node/download/directory-archiver.spec.ts +++ b/packages/filesystem/src/node/download/directory-archiver.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/filesystem/src/node/download/directory-archiver.ts b/packages/filesystem/src/node/download/directory-archiver.ts index 8057474377ac4..c8c99526e8af8 100644 --- a/packages/filesystem/src/node/download/directory-archiver.ts +++ b/packages/filesystem/src/node/download/directory-archiver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/node/download/file-download-backend-module.ts b/packages/filesystem/src/node/download/file-download-backend-module.ts index 4b677ec784b6d..3fb251bacd191 100644 --- a/packages/filesystem/src/node/download/file-download-backend-module.ts +++ b/packages/filesystem/src/node/download/file-download-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/node/download/file-download-cache.ts b/packages/filesystem/src/node/download/file-download-cache.ts index 2704aa57a2ab8..d1bb3285958b8 100644 --- a/packages/filesystem/src/node/download/file-download-cache.ts +++ b/packages/filesystem/src/node/download/file-download-cache.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; import { ILogger } from '@theia/core/lib/common/logger'; diff --git a/packages/filesystem/src/node/download/file-download-endpoint.ts b/packages/filesystem/src/node/download/file-download-endpoint.ts index 0244a04683902..6237c1e7ef050 100644 --- a/packages/filesystem/src/node/download/file-download-endpoint.ts +++ b/packages/filesystem/src/node/download/file-download-endpoint.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/filesystem/src/node/download/file-download-handler.ts b/packages/filesystem/src/node/download/file-download-handler.ts index 558c0423bda08..f1ae5e478c366 100644 --- a/packages/filesystem/src/node/download/file-download-handler.ts +++ b/packages/filesystem/src/node/download/file-download-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as os from 'os'; diff --git a/packages/filesystem/src/node/download/test/mock-directory-archiver.ts b/packages/filesystem/src/node/download/test/mock-directory-archiver.ts index e8d6d075661c7..65e4a76a7b54e 100644 --- a/packages/filesystem/src/node/download/test/mock-directory-archiver.ts +++ b/packages/filesystem/src/node/download/test/mock-directory-archiver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DirectoryArchiver } from '../directory-archiver'; diff --git a/packages/filesystem/src/node/file-change-collection.spec.ts b/packages/filesystem/src/node/file-change-collection.spec.ts index 84f958c5a494b..30f218a5e0eeb 100644 --- a/packages/filesystem/src/node/file-change-collection.spec.ts +++ b/packages/filesystem/src/node/file-change-collection.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/filesystem/src/node/file-change-collection.ts b/packages/filesystem/src/node/file-change-collection.ts index 3313d07db85fd..4cf19721733d0 100644 --- a/packages/filesystem/src/node/file-change-collection.ts +++ b/packages/filesystem/src/node/file-change-collection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FileChange, FileChangeType } from '../common/filesystem-watcher-protocol'; diff --git a/packages/filesystem/src/node/filesystem-backend-module.ts b/packages/filesystem/src/node/filesystem-backend-module.ts index 210284be6d34d..c8e973f3f66b1 100644 --- a/packages/filesystem/src/node/filesystem-backend-module.ts +++ b/packages/filesystem/src/node/filesystem-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/filesystem/src/node/filesystem-watcher-client.ts b/packages/filesystem/src/node/filesystem-watcher-client.ts index 03a35444564c0..ce44d8099fedd 100644 --- a/packages/filesystem/src/node/filesystem-watcher-client.ts +++ b/packages/filesystem/src/node/filesystem-watcher-client.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/node/filesystem-watcher-dispatcher.ts b/packages/filesystem/src/node/filesystem-watcher-dispatcher.ts index b3aa398996f23..c0615d75a6bff 100644 --- a/packages/filesystem/src/node/filesystem-watcher-dispatcher.ts +++ b/packages/filesystem/src/node/filesystem-watcher-dispatcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/filesystem/src/node/node-file-upload-service.ts b/packages/filesystem/src/node/node-file-upload-service.ts index c29ee1d2573b3..efd063348ecde 100644 --- a/packages/filesystem/src/node/node-file-upload-service.ts +++ b/packages/filesystem/src/node/node-file-upload-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import multer = require('multer'); @@ -67,7 +67,7 @@ export class NodeFileUploadService implements BackendApplicationContribution { if (!fields.leaveInTemp) { await fs.move(request.file.path, target, { overwrite: true }); } else { - // leave the file where it is, just rename it to its original name + // leave the file where it is, just rename it to its original name fs.rename(request.file.path, request.file.path.replace(request.file.filename, request.file.originalname)); } response.status(200).send(target); // ok diff --git a/packages/filesystem/src/node/nsfw-watcher/index.ts b/packages/filesystem/src/node/nsfw-watcher/index.ts index 2708aeb0782af..82b64eab99973 100644 --- a/packages/filesystem/src/node/nsfw-watcher/index.ts +++ b/packages/filesystem/src/node/nsfw-watcher/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as yargs from '@theia/core/shared/yargs'; diff --git a/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-service.ts b/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-service.ts index e5d5812e79ebc..a23c3a446050d 100644 --- a/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-service.ts +++ b/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import nsfw = require('@theia/core/shared/nsfw'); diff --git a/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-watcher.spec.ts b/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-watcher.spec.ts index 3088295e1f83b..a59450b15812d 100644 --- a/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-watcher.spec.ts +++ b/packages/filesystem/src/node/nsfw-watcher/nsfw-filesystem-watcher.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as temp from 'temp'; diff --git a/packages/filesystem/src/node/nsfw-watcher/nsfw-options.ts b/packages/filesystem/src/node/nsfw-watcher/nsfw-options.ts index 1d0fba14f9439..f658c4bb4e7ed 100644 --- a/packages/filesystem/src/node/nsfw-watcher/nsfw-options.ts +++ b/packages/filesystem/src/node/nsfw-watcher/nsfw-options.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as nsfw from '@theia/core/shared/nsfw'; diff --git a/packages/filesystem/src/typings/dom.webkit.d.ts b/packages/filesystem/src/typings/dom.webkit.d.ts index adab13013b6ae..c3e6d261e470e 100644 --- a/packages/filesystem/src/typings/dom.webkit.d.ts +++ b/packages/filesystem/src/typings/dom.webkit.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable no-var */ diff --git a/packages/filesystem/src/typings/mv/index.d.ts b/packages/filesystem/src/typings/mv/index.d.ts index 4fad58416ebe8..778bb2e9bca3c 100644 --- a/packages/filesystem/src/typings/mv/index.d.ts +++ b/packages/filesystem/src/typings/mv/index.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export = mv; diff --git a/packages/filesystem/src/typings/nsfw/index.d.ts b/packages/filesystem/src/typings/nsfw/index.d.ts index c9402f7b45c11..0573effb0d4c1 100644 --- a/packages/filesystem/src/typings/nsfw/index.d.ts +++ b/packages/filesystem/src/typings/nsfw/index.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line spaced-comment diff --git a/packages/filesystem/src/typings/trash/index.d.ts b/packages/filesystem/src/typings/trash/index.d.ts index 83194e886ce39..9ed911f5d70f0 100644 --- a/packages/filesystem/src/typings/trash/index.d.ts +++ b/packages/filesystem/src/typings/trash/index.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export = trash; diff --git a/packages/getting-started/package.json b/packages/getting-started/package.json index 914ed98c183c9..0c2711ad82e85 100644 --- a/packages/getting-started/package.json +++ b/packages/getting-started/package.json @@ -18,7 +18,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/getting-started/src/browser/getting-started-contribution.ts b/packages/getting-started/src/browser/getting-started-contribution.ts index 152419d894f7e..f3a21ca099347 100644 --- a/packages/getting-started/src/browser/getting-started-contribution.ts +++ b/packages/getting-started/src/browser/getting-started-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/getting-started/src/browser/getting-started-frontend-module.ts b/packages/getting-started/src/browser/getting-started-frontend-module.ts index e9cdcc0ab386c..a51e8b627f19c 100644 --- a/packages/getting-started/src/browser/getting-started-frontend-module.ts +++ b/packages/getting-started/src/browser/getting-started-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { GettingStartedContribution } from './getting-started-contribution'; diff --git a/packages/getting-started/src/browser/getting-started-widget.tsx b/packages/getting-started/src/browser/getting-started-widget.tsx index 352a0528cfc32..d468240e7db2e 100644 --- a/packages/getting-started/src/browser/getting-started-widget.tsx +++ b/packages/getting-started/src/browser/getting-started-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/getting-started/src/browser/style/index.css b/packages/getting-started/src/browser/style/index.css index 83010466b5b02..2a23b097fdd32 100644 --- a/packages/getting-started/src/browser/style/index.css +++ b/packages/getting-started/src/browser/style/index.css @@ -11,80 +11,81 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -html, body { - font-family: var(--theia-ui-font-family); +html, +body { + font-family: var(--theia-ui-font-family); } .col { - flex: 1; - align-items: center; - justify-content: center; + flex: 1; + align-items: center; + justify-content: center; } .flex-grid { - display: flex; + display: flex; } .gs-action-container { - line-height: 20px; + line-height: 20px; } .gs-action-details { - padding-left: 5px; - color: var(--theia-descriptionForeground); + padding-left: 5px; + color: var(--theia-descriptionForeground); } .gs-container { - padding: 20px; + padding: 20px; } .gs-container a { - cursor: pointer; + cursor: pointer; } .gs-header h1 { - flex: 1; - font-weight: 600; + flex: 1; + font-weight: 600; } .gs-hr { - background-color: var(--theia-contrastBorder); - height: 1px; - border: 0; - margin: 0px; + background-color: var(--theia-contrastBorder); + height: 1px; + border: 0; + margin: 0px; } .gs-no-recent { - color: var(--theia-descriptionForeground); + color: var(--theia-descriptionForeground); } .gs-section a { - border: none; - font-weight: 500; - text-decoration: none; + border: none; + font-weight: 500; + text-decoration: none; } .gs-section a:hover { - text-decoration: underline; + text-decoration: underline; } .gs-section-header { - font-size: var(--theia-ui-font-size2); - font-weight: 600; - margin-bottom: 5px; - display: flex; - align-items: center; + font-size: var(--theia-ui-font-size2); + font-weight: 600; + margin-bottom: 5px; + display: flex; + align-items: center; } .gs-section-header i { - padding-right: 5px; + padding-right: 5px; } .gs-sub-header { - color: var(--theia-descriptionForeground); - text-transform: capitalize; - font-weight: 400; + color: var(--theia-descriptionForeground); + text-transform: capitalize; + font-weight: 400; } diff --git a/packages/getting-started/src/package.spec.ts b/packages/getting-started/src/package.spec.ts index 5700abd32aa49..9c36c3f491281 100644 --- a/packages/getting-started/src/package.spec.ts +++ b/packages/getting-started/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/git/package.json b/packages/git/package.json index 243b00476b1fc..5eefb866fe7e9 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -42,7 +42,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/git/src/browser/blame/blame-contribution.ts b/packages/git/src/browser/blame/blame-contribution.ts index 460e38bfd83e9..a3fb023eec088 100644 --- a/packages/git/src/browser/blame/blame-contribution.ts +++ b/packages/git/src/browser/blame/blame-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/blame/blame-decorator.ts b/packages/git/src/browser/blame/blame-decorator.ts index 40b1502127aba..9416e7448166f 100644 --- a/packages/git/src/browser/blame/blame-decorator.ts +++ b/packages/git/src/browser/blame/blame-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/blame/blame-manager.ts b/packages/git/src/browser/blame/blame-manager.ts index 5ef8dc4f38e63..1c69632778ee7 100644 --- a/packages/git/src/browser/blame/blame-manager.ts +++ b/packages/git/src/browser/blame/blame-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/blame/blame-module.ts b/packages/git/src/browser/blame/blame-module.ts index 785c49763b449..c2b5924658e30 100644 --- a/packages/git/src/browser/blame/blame-module.ts +++ b/packages/git/src/browser/blame/blame-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-diff-contribution.ts b/packages/git/src/browser/diff/git-diff-contribution.ts index 82b4de5d044e3..674b4ccccfdc5 100644 --- a/packages/git/src/browser/diff/git-diff-contribution.ts +++ b/packages/git/src/browser/diff/git-diff-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandRegistry, Command, MenuModelRegistry, SelectionService, MessageService } from '@theia/core/lib/common'; diff --git a/packages/git/src/browser/diff/git-diff-frontend-module.ts b/packages/git/src/browser/diff/git-diff-frontend-module.ts index 4e8d93540b2df..4c7681b6890bc 100644 --- a/packages/git/src/browser/diff/git-diff-frontend-module.ts +++ b/packages/git/src/browser/diff/git-diff-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-diff-header-widget.tsx b/packages/git/src/browser/diff/git-diff-header-widget.tsx index 4585680c27f60..25b7b42ba9920 100644 --- a/packages/git/src/browser/diff/git-diff-header-widget.tsx +++ b/packages/git/src/browser/diff/git-diff-header-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-diff-tree-model.tsx b/packages/git/src/browser/diff/git-diff-tree-model.tsx index 5147d41fccfcb..3f06311a888d7 100644 --- a/packages/git/src/browser/diff/git-diff-tree-model.tsx +++ b/packages/git/src/browser/diff/git-diff-tree-model.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-diff-widget.tsx b/packages/git/src/browser/diff/git-diff-widget.tsx index ad06f15b8fa85..b00d1feec4516 100644 --- a/packages/git/src/browser/diff/git-diff-widget.tsx +++ b/packages/git/src/browser/diff/git-diff-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-opener-in-primary-area.ts b/packages/git/src/browser/diff/git-opener-in-primary-area.ts index 3f31dc7b67511..b88f24479d3b5 100644 --- a/packages/git/src/browser/diff/git-opener-in-primary-area.ts +++ b/packages/git/src/browser/diff/git-opener-in-primary-area.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/diff/git-resource-opener.ts b/packages/git/src/browser/diff/git-resource-opener.ts index 372db0589d716..04f03a71b536e 100644 --- a/packages/git/src/browser/diff/git-resource-opener.ts +++ b/packages/git/src/browser/diff/git-resource-opener.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts b/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts index f8c5ad5ccd824..0ffc8a4148dfe 100644 --- a/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts +++ b/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/dirty-diff/dirty-diff-manager.ts b/packages/git/src/browser/dirty-diff/dirty-diff-manager.ts index 3881c371e8abd..714ce0f12f943 100644 --- a/packages/git/src/browser/dirty-diff/dirty-diff-manager.ts +++ b/packages/git/src/browser/dirty-diff/dirty-diff-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/dirty-diff/dirty-diff-module.ts b/packages/git/src/browser/dirty-diff/dirty-diff-module.ts index e8ca2a42b8b8f..6b7a4eb9aa744 100644 --- a/packages/git/src/browser/dirty-diff/dirty-diff-module.ts +++ b/packages/git/src/browser/dirty-diff/dirty-diff-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-commit-message-validator.ts b/packages/git/src/browser/git-commit-message-validator.ts index 703d982e1bbe8..7f8e0c2830d00 100644 --- a/packages/git/src/browser/git-commit-message-validator.ts +++ b/packages/git/src/browser/git-commit-message-validator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-contribution.ts b/packages/git/src/browser/git-contribution.ts index c6698a11d115c..8232ecf989c0d 100644 --- a/packages/git/src/browser/git-contribution.ts +++ b/packages/git/src/browser/git-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; import URI from '@theia/core/lib/common/uri'; diff --git a/packages/git/src/browser/git-decoration-provider.ts b/packages/git/src/browser/git-decoration-provider.ts index 94c1e1406057e..5a1789447715a 100644 --- a/packages/git/src/browser/git-decoration-provider.ts +++ b/packages/git/src/browser/git-decoration-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-error-handler.ts b/packages/git/src/browser/git-error-handler.ts index 0338735c95645..cbba06351e481 100644 --- a/packages/git/src/browser/git-error-handler.ts +++ b/packages/git/src/browser/git-error-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-frontend-module.ts b/packages/git/src/browser/git-frontend-module.ts index 87300f256a69f..132f15aa2b745 100644 --- a/packages/git/src/browser/git-frontend-module.ts +++ b/packages/git/src/browser/git-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/git/src/browser/git-preferences.ts b/packages/git/src/browser/git-preferences.ts index 3afbed8d4e41d..e5100ccd19bc4 100644 --- a/packages/git/src/browser/git-preferences.ts +++ b/packages/git/src/browser/git-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-quick-open-service.ts b/packages/git/src/browser/git-quick-open-service.ts index 77e863c8f4417..965037e1dbed6 100644 --- a/packages/git/src/browser/git-quick-open-service.ts +++ b/packages/git/src/browser/git-quick-open-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-repository-provider.spec.ts b/packages/git/src/browser/git-repository-provider.spec.ts index 95386074113df..01bd5ba328b08 100644 --- a/packages/git/src/browser/git-repository-provider.spec.ts +++ b/packages/git/src/browser/git-repository-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/git/src/browser/git-repository-provider.ts b/packages/git/src/browser/git-repository-provider.ts index b67e58e329d57..0f3be07fc8258 100644 --- a/packages/git/src/browser/git-repository-provider.ts +++ b/packages/git/src/browser/git-repository-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('@theia/core/shared/lodash.debounce'); diff --git a/packages/git/src/browser/git-repository-tracker.ts b/packages/git/src/browser/git-repository-tracker.ts index aa924b3dcdd0f..f1e2d189aadaf 100644 --- a/packages/git/src/browser/git-repository-tracker.ts +++ b/packages/git/src/browser/git-repository-tracker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-resource-resolver.ts b/packages/git/src/browser/git-resource-resolver.ts index f757b521ffd09..65002e6d0d0b4 100644 --- a/packages/git/src/browser/git-resource-resolver.ts +++ b/packages/git/src/browser/git-resource-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-resource.ts b/packages/git/src/browser/git-resource.ts index 35aa4ea7e698b..7389da945c13a 100644 --- a/packages/git/src/browser/git-resource.ts +++ b/packages/git/src/browser/git-resource.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Git, Repository } from '../common'; diff --git a/packages/git/src/browser/git-scm-provider.spec.ts b/packages/git/src/browser/git-scm-provider.spec.ts index dfab2d7ef4be9..4458af4af177a 100644 --- a/packages/git/src/browser/git-scm-provider.spec.ts +++ b/packages/git/src/browser/git-scm-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/git/src/browser/git-scm-provider.ts b/packages/git/src/browser/git-scm-provider.ts index 86836561e7a3c..9c35fcea479e8 100644 --- a/packages/git/src/browser/git-scm-provider.ts +++ b/packages/git/src/browser/git-scm-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-sync-service.ts b/packages/git/src/browser/git-sync-service.ts index 356601cc5f9cc..b013edbd3e1e4 100644 --- a/packages/git/src/browser/git-sync-service.ts +++ b/packages/git/src/browser/git-sync-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/git-uri-label-contribution.ts b/packages/git/src/browser/git-uri-label-contribution.ts index b8e37ae727884..3c124bc6d2477 100644 --- a/packages/git/src/browser/git-uri-label-contribution.ts +++ b/packages/git/src/browser/git-uri-label-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/history/git-commit-detail-header-widget.tsx b/packages/git/src/browser/history/git-commit-detail-header-widget.tsx index 2010debc293e2..0c2d021230f1f 100644 --- a/packages/git/src/browser/history/git-commit-detail-header-widget.tsx +++ b/packages/git/src/browser/history/git-commit-detail-header-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/history/git-commit-detail-open-handler.ts b/packages/git/src/browser/history/git-commit-detail-open-handler.ts index 7d7d8e67ce064..10a817fd43f85 100644 --- a/packages/git/src/browser/history/git-commit-detail-open-handler.ts +++ b/packages/git/src/browser/history/git-commit-detail-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/history/git-commit-detail-widget-options.ts b/packages/git/src/browser/history/git-commit-detail-widget-options.ts index 1bdd708148cc0..d334c8b2482ab 100644 --- a/packages/git/src/browser/history/git-commit-detail-widget-options.ts +++ b/packages/git/src/browser/history/git-commit-detail-widget-options.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const GitCommitDetailWidgetOptions = Symbol('GitCommitDetailWidgetOptions'); diff --git a/packages/git/src/browser/history/git-commit-detail-widget.tsx b/packages/git/src/browser/history/git-commit-detail-widget.tsx index ecb92ad5dce8a..3f04cf7bea56b 100644 --- a/packages/git/src/browser/history/git-commit-detail-widget.tsx +++ b/packages/git/src/browser/history/git-commit-detail-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/git/src/browser/history/git-history-frontend-module.ts b/packages/git/src/browser/history/git-history-frontend-module.ts index af433ed44d778..749f0bda92db3 100644 --- a/packages/git/src/browser/history/git-history-frontend-module.ts +++ b/packages/git/src/browser/history/git-history-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/history/git-history-support.ts b/packages/git/src/browser/history/git-history-support.ts index 38d28bda978c5..871237a716601 100644 --- a/packages/git/src/browser/history/git-history-support.ts +++ b/packages/git/src/browser/history/git-history-support.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/history/git-opener-in-secondary-area.ts b/packages/git/src/browser/history/git-opener-in-secondary-area.ts index 5b2809bf8c10d..aedf12fab2cbe 100644 --- a/packages/git/src/browser/history/git-opener-in-secondary-area.ts +++ b/packages/git/src/browser/history/git-opener-in-secondary-area.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/prompt/git-prompt-module.ts b/packages/git/src/browser/prompt/git-prompt-module.ts index 0acc7beb3400e..0ebe2abec7034 100644 --- a/packages/git/src/browser/prompt/git-prompt-module.ts +++ b/packages/git/src/browser/prompt/git-prompt-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/browser/style/diff.css b/packages/git/src/browser/style/diff.css index 62a6061a31a7c..4491464945759 100644 --- a/packages/git/src/browser/style/diff.css +++ b/packages/git/src/browser/style/diff.css @@ -11,98 +11,98 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-git.git-diff-container { - display: flex; - flex-direction: column; - position: relative; - height: 100%; + display: flex; + flex-direction: column; + position: relative; + height: 100%; } .theia-git.git-diff-container .noWrapInfo { - width: 100%; + width: 100%; } .theia-git .listContainer { - flex: 1; - position: relative; + flex: 1; + position: relative; } .theia-git .listContainer .commitList { - height: 100%; + height: 100%; } .theia-git .subject { - font-size: var(--theia-ui-font-size2); - font-weight: bold; + font-size: var(--theia-ui-font-size2); + font-weight: bold; } .theia-git .revision .row-title { - width: 35px; - display: inline-block; + width: 35px; + display: inline-block; } .theia-git .diff-header { - flex-shrink: 0; + flex-shrink: 0; } .theia-git .header-row { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; } .theia-git .header-row.diff-header, .theia-git .header-row.diff-nav { - margin-bottom: 10px; + margin-bottom: 10px; } .theia-git .header-value { - margin: 9px 0px 5px 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + margin: 9px 0px 5px 5px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .theia-git .diff-header .header-value { - align-self: center; - margin: 0px; + align-self: center; + margin: 0px; } .theia-git .diff-header .theia-header { - align-self: center; - padding-right: 5px; + align-self: center; + padding-right: 5px; } .theia-git .diff-header .subject { - font-size: var(--theia-ui-font-size2); - font-weight: bold; + font-size: var(--theia-ui-font-size2); + font-weight: bold; } .theia-git .commit-info { - padding-left: 10px; - box-sizing: border-box; - overflow: hidden; + padding-left: 10px; + box-sizing: border-box; + overflow: hidden; } .theia-git .commit-info-row { - align-items: center; - margin-top: 10px; + align-items: center; + margin-top: 10px; } .theia-git .commit-info .header-row { - margin: 4px 0; + margin: 4px 0; } .theia-git .commit-info .header-row .theia-header { - margin: 1px 0; + margin: 1px 0; } .theia-git .commit-info .header-row .header-value { - margin: 0 0 0 5px; + margin: 0 0 0 5px; } .theia-git .commit-info-row .image-container { - display: flex; + display: flex; } diff --git a/packages/git/src/browser/style/git-icons.css b/packages/git/src/browser/style/git-icons.css index 40dd3ca566472..a9a4409ae64a0 100644 --- a/packages/git/src/browser/style/git-icons.css +++ b/packages/git/src/browser/style/git-icons.css @@ -11,14 +11,14 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .icon-git-commit { - mask-repeat: no-repeat; - mask-position: center; - -webkit-mask-repeat: no-repeat; - -webkit-mask-position: center; - mask-image: url('~octicons/build/svg/git-commit.svg'); - -webkit-mask-image: url('~octicons/build/svg/git-commit.svg'); + mask-repeat: no-repeat; + mask-position: center; + -webkit-mask-repeat: no-repeat; + -webkit-mask-position: center; + mask-image: url("~octicons/build/svg/git-commit.svg"); + -webkit-mask-image: url("~octicons/build/svg/git-commit.svg"); } diff --git a/packages/git/src/browser/style/index.css b/packages/git/src/browser/style/index.css index 66ee7c2e0a493..6f3bcfff008ca 100644 --- a/packages/git/src/browser/style/index.css +++ b/packages/git/src/browser/style/index.css @@ -11,46 +11,46 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-git { - padding: 5px; - box-sizing: border-box; + padding: 5px; + box-sizing: border-box; } .theia-side-panel .theia-git { - padding-left: 19px; + padding-left: 19px; } .theia-git .space-between { - justify-content: space-between; + justify-content: space-between; } .theia-scm .scmItem .git-status.new { - color: var(--theia-gitDecoration-untrackedResourceForeground); + color: var(--theia-gitDecoration-untrackedResourceForeground); } .theia-scm .scmItem .git-status.new.staged { - color: var(--theia-gitDecoration-addedResourceForeground); + color: var(--theia-gitDecoration-addedResourceForeground); } .theia-scm .scmItem .git-status.modified { - color: var(--theia-gitDecoration-modifiedResourceForeground); + color: var(--theia-gitDecoration-modifiedResourceForeground); } .theia-scm .scmItem .git-status.deleted { - color: var(--theia-gitDecoration-deletedResourceForeground); + color: var(--theia-gitDecoration-deletedResourceForeground); } .theia-scm .scmItem .git-status.renamed { - color: var(--theia-gitDecoration-untrackedResourceForeground); + color: var(--theia-gitDecoration-untrackedResourceForeground); } .theia-scm .scmItem .git-status.conflicted { - color: var(--theia-gitDecoration-conflictingResourceForeground); + color: var(--theia-gitDecoration-conflictingResourceForeground); } .theia-scm .scmItem .git-status.copied { - color: var(--theia-gitDecoration-modifiedResourceForeground); + color: var(--theia-gitDecoration-modifiedResourceForeground); } diff --git a/packages/git/src/common/git-model.ts b/packages/git/src/common/git-model.ts index efd50361d548f..1d02f5d1343f6 100644 --- a/packages/git/src/common/git-model.ts +++ b/packages/git/src/common/git-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/git/src/common/git-prompt.ts b/packages/git/src/common/git-prompt.ts index 7458d11cecaa8..0adf3d60a51f4 100644 --- a/packages/git/src/common/git-prompt.ts +++ b/packages/git/src/common/git-prompt.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/common/git-watcher.ts b/packages/git/src/common/git-watcher.ts index 05f3111238200..159997a4cc223 100644 --- a/packages/git/src/common/git-watcher.ts +++ b/packages/git/src/common/git-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/common/git.ts b/packages/git/src/common/git.ts index 80335bfa5e527..76a99778ab20a 100644 --- a/packages/git/src/common/git.ts +++ b/packages/git/src/common/git.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ChildProcess } from 'child_process'; diff --git a/packages/git/src/common/index.ts b/packages/git/src/common/index.ts index 090283e3919f7..df65cf4b88c26 100644 --- a/packages/git/src/common/index.ts +++ b/packages/git/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './git'; diff --git a/packages/git/src/electron-browser/prompt/electron-git-prompt-module.ts b/packages/git/src/electron-browser/prompt/electron-git-prompt-module.ts index af4a4f598a137..891d9c97ed76c 100644 --- a/packages/git/src/electron-browser/prompt/electron-git-prompt-module.ts +++ b/packages/git/src/electron-browser/prompt/electron-git-prompt-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/electron-browser/prompt/git-quick-open-prompt.ts b/packages/git/src/electron-browser/prompt/git-quick-open-prompt.ts index 32882a7fbb36f..75a3c23cac1d3 100644 --- a/packages/git/src/electron-browser/prompt/git-quick-open-prompt.ts +++ b/packages/git/src/electron-browser/prompt/git-quick-open-prompt.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/electron-node/env/electron-git-env-module.ts b/packages/git/src/electron-node/env/electron-git-env-module.ts index 2893646795df0..219e6159ea365 100644 --- a/packages/git/src/electron-node/env/electron-git-env-module.ts +++ b/packages/git/src/electron-node/env/electron-git-env-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/electron-node/env/electron-git-env-provider.ts b/packages/git/src/electron-node/env/electron-git-env-provider.ts index f154b91832c89..7ab152886f0a7 100644 --- a/packages/git/src/electron-node/env/electron-git-env-provider.ts +++ b/packages/git/src/electron-node/env/electron-git-env-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/dugite-git-prompt.ts b/packages/git/src/node/dugite-git-prompt.ts index d817168a02e05..2b566174681f8 100644 --- a/packages/git/src/node/dugite-git-prompt.ts +++ b/packages/git/src/node/dugite-git-prompt.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/dugite-git-watcher.slow-spec.ts b/packages/git/src/node/dugite-git-watcher.slow-spec.ts index 10c64d1140abe..5a4f0e95bdd4f 100644 --- a/packages/git/src/node/dugite-git-watcher.slow-spec.ts +++ b/packages/git/src/node/dugite-git-watcher.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/git/src/node/dugite-git-watcher.ts b/packages/git/src/node/dugite-git-watcher.ts index 70d6c4b552c70..90d721fb039a9 100644 --- a/packages/git/src/node/dugite-git-watcher.ts +++ b/packages/git/src/node/dugite-git-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/dugite-git.slow-spec.ts b/packages/git/src/node/dugite-git.slow-spec.ts index e2e04bd2dc210..888507b401d54 100644 --- a/packages/git/src/node/dugite-git.slow-spec.ts +++ b/packages/git/src/node/dugite-git.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as temp from 'temp'; diff --git a/packages/git/src/node/dugite-git.spec.ts b/packages/git/src/node/dugite-git.spec.ts index fc5e5d8ee5203..db3592f321c7c 100644 --- a/packages/git/src/node/dugite-git.spec.ts +++ b/packages/git/src/node/dugite-git.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as upath from 'upath'; diff --git a/packages/git/src/node/dugite-git.ts b/packages/git/src/node/dugite-git.ts index f5bd169bd8016..c499659bbb24c 100644 --- a/packages/git/src/node/dugite-git.ts +++ b/packages/git/src/node/dugite-git.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/git/src/node/env/git-env-module.ts b/packages/git/src/node/env/git-env-module.ts index 62fc4f076be2a..c1ee413c55578 100644 --- a/packages/git/src/node/env/git-env-module.ts +++ b/packages/git/src/node/env/git-env-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/env/git-env-provider.ts b/packages/git/src/node/env/git-env-provider.ts index dc268d707c82e..a3f40593f4137 100644 --- a/packages/git/src/node/env/git-env-provider.ts +++ b/packages/git/src/node/env/git-env-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/git-backend-module.ts b/packages/git/src/node/git-backend-module.ts index 6850379d66534..ca57956b5b19a 100644 --- a/packages/git/src/node/git-backend-module.ts +++ b/packages/git/src/node/git-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, Container, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/git-exec-provider.ts b/packages/git/src/node/git-exec-provider.ts index 64458543d6e58..32459c7a9eee8 100644 --- a/packages/git/src/node/git-exec-provider.ts +++ b/packages/git/src/node/git-exec-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/git-locator/git-locator-client.ts b/packages/git/src/node/git-locator/git-locator-client.ts index 7f574436bcd8d..f58f4f0871f9a 100644 --- a/packages/git/src/node/git-locator/git-locator-client.ts +++ b/packages/git/src/node/git-locator/git-locator-client.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as paths from 'path'; diff --git a/packages/git/src/node/git-locator/git-locator-host.ts b/packages/git/src/node/git-locator/git-locator-host.ts index afdc837050f75..c2a40b0cc90e4 100644 --- a/packages/git/src/node/git-locator/git-locator-host.ts +++ b/packages/git/src/node/git-locator/git-locator-host.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcProxyFactory } from '@theia/core'; diff --git a/packages/git/src/node/git-locator/git-locator-impl.ts b/packages/git/src/node/git-locator/git-locator-impl.ts index 29753e4ac0fbb..7e84af071a1cb 100644 --- a/packages/git/src/node/git-locator/git-locator-impl.ts +++ b/packages/git/src/node/git-locator/git-locator-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/git/src/node/git-locator/git-locator-protocol.ts b/packages/git/src/node/git-locator/git-locator-protocol.ts index 4cb1241da0bac..2e5e39c7ecffd 100644 --- a/packages/git/src/node/git-locator/git-locator-protocol.ts +++ b/packages/git/src/node/git-locator/git-locator-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '@theia/core'; diff --git a/packages/git/src/node/git-repository-manager.ts b/packages/git/src/node/git-repository-manager.ts index a2668d0187b67..622ea34760643 100644 --- a/packages/git/src/node/git-repository-manager.ts +++ b/packages/git/src/node/git-repository-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/git-repository-watcher.ts b/packages/git/src/node/git-repository-watcher.ts index e8b6153ef8c33..3e1bc8a43e8b1 100644 --- a/packages/git/src/node/git-repository-watcher.ts +++ b/packages/git/src/node/git-repository-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/init/git-init.ts b/packages/git/src/node/init/git-init.ts index 5446de462bbb4..a7b0c15675786 100644 --- a/packages/git/src/node/init/git-init.ts +++ b/packages/git/src/node/init/git-init.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/test/binding-helper.ts b/packages/git/src/node/test/binding-helper.ts index 672b80b2fd009..b1f446e922c18 100644 --- a/packages/git/src/node/test/binding-helper.ts +++ b/packages/git/src/node/test/binding-helper.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/git/src/node/test/no-sync-repository-manager.ts b/packages/git/src/node/test/no-sync-repository-manager.ts index e761d88b771ef..ea5a50ae02e2c 100644 --- a/packages/git/src/node/test/no-sync-repository-manager.ts +++ b/packages/git/src/node/test/no-sync-repository-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/keymaps/package.json b/packages/keymaps/package.json index 7eb181f3918b7..4a9e6a02fe2de 100644 --- a/packages/keymaps/package.json +++ b/packages/keymaps/package.json @@ -24,7 +24,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/keymaps/src/browser/index.ts b/packages/keymaps/src/browser/index.ts index abe993b3d0652..91171c9d92ec2 100644 --- a/packages/keymaps/src/browser/index.ts +++ b/packages/keymaps/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './keymaps-frontend-module'; diff --git a/packages/keymaps/src/browser/keybinding-schema-updater.ts b/packages/keymaps/src/browser/keybinding-schema-updater.ts index 6db52d817529c..c19504310f8e6 100644 --- a/packages/keymaps/src/browser/keybinding-schema-updater.ts +++ b/packages/keymaps/src/browser/keybinding-schema-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls, CommandRegistry, InMemoryResources, deepClone } from '@theia/core/lib/common'; diff --git a/packages/keymaps/src/browser/keybindings-widget.tsx b/packages/keymaps/src/browser/keybindings-widget.tsx index 70408c13fd52b..27991c71b8bd8 100644 --- a/packages/keymaps/src/browser/keybindings-widget.tsx +++ b/packages/keymaps/src/browser/keybindings-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import React = require('@theia/core/shared/react'); diff --git a/packages/keymaps/src/browser/keymaps-frontend-contribution.ts b/packages/keymaps/src/browser/keymaps-frontend-contribution.ts index 93002aba775b1..9e737063931c4 100644 --- a/packages/keymaps/src/browser/keymaps-frontend-contribution.ts +++ b/packages/keymaps/src/browser/keymaps-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/keymaps/src/browser/keymaps-frontend-module.ts b/packages/keymaps/src/browser/keymaps-frontend-module.ts index a9b4c67c785a9..2056444246231 100644 --- a/packages/keymaps/src/browser/keymaps-frontend-module.ts +++ b/packages/keymaps/src/browser/keymaps-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import './keymaps-monaco-contribution'; diff --git a/packages/keymaps/src/browser/keymaps-monaco-contribution.ts b/packages/keymaps/src/browser/keymaps-monaco-contribution.ts index ce9598f0be09c..a18a9cb873a7f 100644 --- a/packages/keymaps/src/browser/keymaps-monaco-contribution.ts +++ b/packages/keymaps/src/browser/keymaps-monaco-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/keymaps/src/browser/keymaps-service.ts b/packages/keymaps/src/browser/keymaps-service.ts index 6976eb135c811..411314007b3d4 100644 --- a/packages/keymaps/src/browser/keymaps-service.ts +++ b/packages/keymaps/src/browser/keymaps-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/keymaps/src/browser/style/index.css b/packages/keymaps/src/browser/style/index.css index 7cefcc39ae7d8..5349c0e763d89 100644 --- a/packages/keymaps/src/browser/style/index.css +++ b/packages/keymaps/src/browser/style/index.css @@ -11,161 +11,168 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #kb-main-container { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; } #kb-table-container { - flex: 1; - overflow: auto; + flex: 1; + overflow: auto; } .fuzzy-match { - font-weight: 600; - color: var(--theia-list-highlightForeground); + font-weight: 600; + color: var(--theia-list-highlightForeground); } .kb-actions { - text-align: center; - vertical-align: middle; + text-align: center; + vertical-align: middle; } .kb-action-item { - visibility: hidden; - padding-right: 5px; + visibility: hidden; + padding-right: 5px; } .kb table { - border-spacing: 0; - border-collapse: separate; - background-color: var(--theia-editor-background); - width: 100%; - table-layout: fixed; + border-spacing: 0; + border-collapse: separate; + background-color: var(--theia-editor-background); + width: 100%; + table-layout: fixed; } .kb table tr { - min-height: var(--theia-icon-size); + min-height: var(--theia-icon-size); } -.th-action, .th-keybinding, -.kb-actions, .kb-keybinding { - min-height: 18px; - overflow: hidden; - vertical-align: middle; - white-space: nowrap; +.th-action, +.th-keybinding, +.kb-actions, +.kb-keybinding { + min-height: 18px; + overflow: hidden; + vertical-align: middle; + white-space: nowrap; } .th-action, .kb-actions { - padding: 2px 0px 5px 0px; + padding: 2px 0px 5px 0px; } .th-keybinding, .kb-keybinding { - padding: 2px 10px 5px 10px; + padding: 2px 10px 5px 10px; } -.th-label, .th-source, .th-context, .th-keybinding, -.kb-label, .kb-source, .kb-context { - padding: 2px 10px 5px 10px; - min-height: 18px; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: middle; - white-space: nowrap; +.th-label, +.th-source, +.th-context, +.th-keybinding, +.kb-label, +.kb-source, +.kb-context { + padding: 2px 10px 5px 10px; + min-height: 18px; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + white-space: nowrap; } .kb table th { - font-size: var(--theia-ui-font-size1); + font-size: var(--theia-ui-font-size1); } .kb table td code { - font-size: 90%; + font-size: 90%; } .td-source { - text-transform: lowercase; + text-transform: lowercase; } .kb table tr:nth-child(odd) { - background-color: rgba(130, 130, 130, 0.04); + background-color: rgba(130, 130, 130, 0.04); } .kb table tbody tr:hover { - background-color: var(--theia-list-focusBackground); + background-color: var(--theia-list-focusBackground); } .kb table tbody tr:hover .kb-action-item { - visibility: visible; - color: var(--theia-icon-foreground); - text-decoration: none; + visibility: visible; + color: var(--theia-icon-foreground); + text-decoration: none; } .kb table th { - word-break: keep-all; - padding-bottom: 5px; - padding-top: 5px; - text-align: left; - vertical-align: middle; - position: sticky; - top: 0; - background-color: var(--theia-editorWidget-background); - text-transform: capitalize; + word-break: keep-all; + padding-bottom: 5px; + padding-top: 5px; + text-align: left; + vertical-align: middle; + position: sticky; + top: 0; + background-color: var(--theia-editorWidget-background); + text-transform: capitalize; } .kb table .th-action { - width: 4%; + width: 4%; } .kb table .th-label { - width: 25%; + width: 25%; } .kb table .th-keybinding { - width: 20%; + width: 20%; } .kb table .th-source { - width: 10%; + width: 10%; } .kb table .th-context { - width: 25%; + width: 25%; } .no-kb { - border: 1px solid var(--theia-editorWarning-foreground); + border: 1px solid var(--theia-editorWarning-foreground); } #search-kb { - height: 25px; - flex: 1; + height: 25px; + flex: 1; } .vs #search-kb { - border: 1px solid #ddd; + border: 1px solid #ddd; } .search-kb-container { - padding: 10px; - display: flex; + padding: 10px; + display: flex; } .kb-item-row td a, .kb-item-row td a:active, .kb-item-row td a:focus { - outline: 0; - border: none; + outline: 0; + border: none; } .kb-actions-icons { - display: block; - width: 50%; - margin-left: auto; - margin-right: auto; + display: block; + width: 50%; + margin-left: auto; + margin-right: auto; } diff --git a/packages/keymaps/src/package.spec.ts b/packages/keymaps/src/package.spec.ts index ba9bafe82ee67..55e11212006ac 100644 --- a/packages/keymaps/src/package.spec.ts +++ b/packages/keymaps/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/markers/package.json b/packages/markers/package.json index dcca948a3a428..0baebea810667 100644 --- a/packages/markers/package.json +++ b/packages/markers/package.json @@ -18,7 +18,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/markers/src/browser/index.ts b/packages/markers/src/browser/index.ts index b194a33d57d43..ba7ad24e74f6d 100644 --- a/packages/markers/src/browser/index.ts +++ b/packages/markers/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './marker-manager'; diff --git a/packages/markers/src/browser/marker-manager.ts b/packages/markers/src/browser/marker-manager.ts index 7ffd75813dacb..39422190f6bc5 100644 --- a/packages/markers/src/browser/marker-manager.ts +++ b/packages/markers/src/browser/marker-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/marker-tree-label-provider.spec.ts b/packages/markers/src/browser/marker-tree-label-provider.spec.ts index 51764aba34e8e..45b2f8ea89699 100644 --- a/packages/markers/src/browser/marker-tree-label-provider.spec.ts +++ b/packages/markers/src/browser/marker-tree-label-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/markers/src/browser/marker-tree-label-provider.ts b/packages/markers/src/browser/marker-tree-label-provider.ts index c28614bf48379..9e8ecbc2bcc1c 100644 --- a/packages/markers/src/browser/marker-tree-label-provider.ts +++ b/packages/markers/src/browser/marker-tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/marker-tree-model.ts b/packages/markers/src/browser/marker-tree-model.ts index d3df7fa215126..2dd1ac1017730 100644 --- a/packages/markers/src/browser/marker-tree-model.ts +++ b/packages/markers/src/browser/marker-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/marker-tree.ts b/packages/markers/src/browser/marker-tree.ts index 8018bae409621..1ba5d89556c19 100644 --- a/packages/markers/src/browser/marker-tree.ts +++ b/packages/markers/src/browser/marker-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-composite-tree-node.spec.ts b/packages/markers/src/browser/problem/problem-composite-tree-node.spec.ts index cb821a8ea3c2c..6d3150bfda7d5 100644 --- a/packages/markers/src/browser/problem/problem-composite-tree-node.spec.ts +++ b/packages/markers/src/browser/problem/problem-composite-tree-node.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/markers/src/browser/problem/problem-composite-tree-node.ts b/packages/markers/src/browser/problem/problem-composite-tree-node.ts index 5e602c17a224a..a5b20be14516b 100644 --- a/packages/markers/src/browser/problem/problem-composite-tree-node.ts +++ b/packages/markers/src/browser/problem/problem-composite-tree-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CompositeTreeNode } from '@theia/core/lib/browser/tree/tree'; diff --git a/packages/markers/src/browser/problem/problem-container.ts b/packages/markers/src/browser/problem/problem-container.ts index 5d5af92f50ca1..d4f8c63d5f957 100644 --- a/packages/markers/src/browser/problem/problem-container.ts +++ b/packages/markers/src/browser/problem/problem-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-contribution.ts b/packages/markers/src/browser/problem/problem-contribution.ts index 817911b89b9a8..bca3381c9c8bf 100644 --- a/packages/markers/src/browser/problem/problem-contribution.ts +++ b/packages/markers/src/browser/problem/problem-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('@theia/core/shared/lodash.debounce'); diff --git a/packages/markers/src/browser/problem/problem-decorations-provider.ts b/packages/markers/src/browser/problem/problem-decorations-provider.ts index 059ca822e0e68..ca9223d8ecb5f 100644 --- a/packages/markers/src/browser/problem/problem-decorations-provider.ts +++ b/packages/markers/src/browser/problem/problem-decorations-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-decorator.ts b/packages/markers/src/browser/problem/problem-decorator.ts index 67f4d647ff586..70b58e9e59ab3 100644 --- a/packages/markers/src/browser/problem/problem-decorator.ts +++ b/packages/markers/src/browser/problem/problem-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-frontend-module.ts b/packages/markers/src/browser/problem/problem-frontend-module.ts index c83beadf88acf..cf236fe98ec27 100644 --- a/packages/markers/src/browser/problem/problem-frontend-module.ts +++ b/packages/markers/src/browser/problem/problem-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../../src/browser/style/index.css'; diff --git a/packages/markers/src/browser/problem/problem-layout-migrations.ts b/packages/markers/src/browser/problem/problem-layout-migrations.ts index e98cf783f86e9..a0b52400f21a3 100644 --- a/packages/markers/src/browser/problem/problem-layout-migrations.ts +++ b/packages/markers/src/browser/problem/problem-layout-migrations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-manager.spec.ts b/packages/markers/src/browser/problem/problem-manager.spec.ts index 54ad106cfb8df..537923d83b097 100644 --- a/packages/markers/src/browser/problem/problem-manager.spec.ts +++ b/packages/markers/src/browser/problem/problem-manager.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/markers/src/browser/problem/problem-manager.ts b/packages/markers/src/browser/problem/problem-manager.ts index fd40159094d16..a038664fb6e06 100644 --- a/packages/markers/src/browser/problem/problem-manager.ts +++ b/packages/markers/src/browser/problem/problem-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-preferences.ts b/packages/markers/src/browser/problem/problem-preferences.ts index db151a1d5af52..b778d514ed9e4 100644 --- a/packages/markers/src/browser/problem/problem-preferences.ts +++ b/packages/markers/src/browser/problem/problem-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-selection.ts b/packages/markers/src/browser/problem/problem-selection.ts index 0651e5e0fb682..3d545c3c973c9 100644 --- a/packages/markers/src/browser/problem/problem-selection.ts +++ b/packages/markers/src/browser/problem/problem-selection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SelectionService } from '@theia/core/lib/common/selection-service'; diff --git a/packages/markers/src/browser/problem/problem-tabbar-decorator.ts b/packages/markers/src/browser/problem/problem-tabbar-decorator.ts index 832bd2452d97e..577f7bc71522b 100644 --- a/packages/markers/src/browser/problem/problem-tabbar-decorator.ts +++ b/packages/markers/src/browser/problem/problem-tabbar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-tree-model.spec.ts b/packages/markers/src/browser/problem/problem-tree-model.spec.ts index 3ce6551647382..bb2e73b7d7387 100644 --- a/packages/markers/src/browser/problem/problem-tree-model.spec.ts +++ b/packages/markers/src/browser/problem/problem-tree-model.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/markers/src/browser/problem/problem-tree-model.ts b/packages/markers/src/browser/problem/problem-tree-model.ts index 3267f0ec9ae64..152feb7a33408 100644 --- a/packages/markers/src/browser/problem/problem-tree-model.ts +++ b/packages/markers/src/browser/problem/problem-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ProblemMarker } from '../../common/problem-marker'; diff --git a/packages/markers/src/browser/problem/problem-utils.ts b/packages/markers/src/browser/problem/problem-utils.ts index 1068331e6fb02..48d05570eb0c7 100644 --- a/packages/markers/src/browser/problem/problem-utils.ts +++ b/packages/markers/src/browser/problem/problem-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Marker } from '../../common/marker'; diff --git a/packages/markers/src/browser/problem/problem-widget-tab-bar-decorator.ts b/packages/markers/src/browser/problem/problem-widget-tab-bar-decorator.ts index d33309d75af64..29fd7149edf43 100644 --- a/packages/markers/src/browser/problem/problem-widget-tab-bar-decorator.ts +++ b/packages/markers/src/browser/problem/problem-widget-tab-bar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/problem/problem-widget.tsx b/packages/markers/src/browser/problem/problem-widget.tsx index 2229d2116906f..567506a3c3cb8 100644 --- a/packages/markers/src/browser/problem/problem-widget.tsx +++ b/packages/markers/src/browser/problem/problem-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/markers/src/browser/style/index.css b/packages/markers/src/browser/style/index.css index 26ac31ee959de..93862f05e5686 100644 --- a/packages/markers/src/browser/style/index.css +++ b/packages/markers/src/browser/style/index.css @@ -11,82 +11,82 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-marker-container { - font-size: var(--theia-ui-font-size1); + font-size: var(--theia-ui-font-size1); } .theia-side-panel .theia-marker-container .noMarkers { - padding-left: 19px; + padding-left: 19px; } .theia-marker-container .markerNode, .theia-marker-container .markerFileNode { - display: flex; - align-items: center; + display: flex; + align-items: center; } .theia-marker-container .markerNode div, .theia-marker-container .markerFileNode div:not(.file-icon) { - display: flex; - margin-right: 5px; + display: flex; + margin-right: 5px; } .theia-marker-container .markerFileNode .name, .theia-marker-container .markerFileNode .path { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .theia-marker-container .markerFileNode .path { - font-size: var(--theia-ui-font-size0); - align-self: flex-end; - white-space: nowrap; + font-size: var(--theia-ui-font-size0); + align-self: flex-end; + white-space: nowrap; } .theia-marker-container .error { - color: var(--theia-editorError-foreground); - opacity: 1; + color: var(--theia-editorError-foreground); + opacity: 1; } .theia-marker-container .warning { - color: var(--theia-editorWarning-foreground); - opacity: 1; + color: var(--theia-editorWarning-foreground); + opacity: 1; } .theia-marker-container .information { - color: var(--theia-editorInfo-foreground); - opacity: 1; + color: var(--theia-editorInfo-foreground); + opacity: 1; } .theia-marker-container .hint { - color: var(--theia-successBackground); - opacity: 1; + color: var(--theia-successBackground); + opacity: 1; } .theia-marker-container .markerNode .position, .theia-marker-container .markerNode .owner { - white-space: nowrap; - margin-left: 5px; + white-space: nowrap; + margin-left: 5px; } .theia-marker-container .markerNode .message { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .theia-marker-container .row-button-container { - display: none; + display: none; } .theia-marker-container .theia-TreeNodeContent:hover .row-button-container { - display: flex; - justify-content: flex-end; - flex: 1; - align-items: center; - align-self: center; + display: flex; + justify-content: flex-end; + flex: 1; + align-items: center; + align-self: center; } diff --git a/packages/markers/src/common/marker.ts b/packages/markers/src/common/marker.ts index 4a5bf25f717bc..5f711812c446c 100644 --- a/packages/markers/src/common/marker.ts +++ b/packages/markers/src/common/marker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject, isString } from '@theia/core/lib/common/types'; diff --git a/packages/markers/src/common/problem-marker.ts b/packages/markers/src/common/problem-marker.ts index a9e56a4efbecb..0f7989aef9d23 100644 --- a/packages/markers/src/common/problem-marker.ts +++ b/packages/markers/src/common/problem-marker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Marker } from './marker'; diff --git a/packages/memory-inspector/package.json b/packages/memory-inspector/package.json index 99cec7cf7acc4..b1642485045a9 100644 --- a/packages/memory-inspector/package.json +++ b/packages/memory-inspector/package.json @@ -6,7 +6,7 @@ "theia-extension" ], "homepage": "https://github.com/eclipse-theia/theia", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/memory-inspector/src/browser/diff-widget/memory-diff-options-widget.tsx b/packages/memory-inspector/src/browser/diff-widget/memory-diff-options-widget.tsx index d9c550079341c..a7349f24bcb7c 100644 --- a/packages/memory-inspector/src/browser/diff-widget/memory-diff-options-widget.tsx +++ b/packages/memory-inspector/src/browser/diff-widget/memory-diff-options-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Key, KeyCode } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/diff-widget/memory-diff-select-widget.tsx b/packages/memory-inspector/src/browser/diff-widget/memory-diff-select-widget.tsx index 6c902f3488ea6..68e4302dae4f4 100644 --- a/packages/memory-inspector/src/browser/diff-widget/memory-diff-select-widget.tsx +++ b/packages/memory-inspector/src/browser/diff-widget/memory-diff-select-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Key, KeyCode, Message, ReactWidget } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/diff-widget/memory-diff-table-widget.tsx b/packages/memory-inspector/src/browser/diff-widget/memory-diff-table-widget.tsx index b913b26a21092..bd190ed17ec26 100644 --- a/packages/memory-inspector/src/browser/diff-widget/memory-diff-table-widget.tsx +++ b/packages/memory-inspector/src/browser/diff-widget/memory-diff-table-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/memory-inspector/src/browser/diff-widget/memory-diff-widget-types.ts b/packages/memory-inspector/src/browser/diff-widget/memory-diff-widget-types.ts index b422398c1341b..43ed5f2509dc6 100644 --- a/packages/memory-inspector/src/browser/diff-widget/memory-diff-widget-types.ts +++ b/packages/memory-inspector/src/browser/diff-widget/memory-diff-widget-types.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { MemoryTable } from '../memory-widget/memory-table-widget'; diff --git a/packages/memory-inspector/src/browser/editable-widget/memory-editable-table-widget.tsx b/packages/memory-inspector/src/browser/editable-widget/memory-editable-table-widget.tsx index 6320cfb9825ba..ef92a307733c2 100644 --- a/packages/memory-inspector/src/browser/editable-widget/memory-editable-table-widget.tsx +++ b/packages/memory-inspector/src/browser/editable-widget/memory-editable-table-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Key, KeyCode } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/memory-inspector-frontend-contribution.ts b/packages/memory-inspector/src/browser/memory-inspector-frontend-contribution.ts index 1e0ae09317268..c084dcfd0cc38 100644 --- a/packages/memory-inspector/src/browser/memory-inspector-frontend-contribution.ts +++ b/packages/memory-inspector/src/browser/memory-inspector-frontend-contribution.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { AbstractViewContribution, FrontendApplicationContribution, Widget } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/memory-inspector-frontend-module.ts b/packages/memory-inspector/src/browser/memory-inspector-frontend-module.ts index f34b0776e9aa6..612a849e906c4 100644 --- a/packages/memory-inspector/src/browser/memory-inspector-frontend-module.ts +++ b/packages/memory-inspector/src/browser/memory-inspector-frontend-module.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import '../../src/browser/register-widget/register-widget.css'; diff --git a/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts b/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts index 78daf63aa0ba1..e912ce03309f2 100644 --- a/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts +++ b/packages/memory-inspector/src/browser/memory-provider/cdt-gdb-memory-provider.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/memory-inspector/src/browser/memory-provider/memory-provider-service.ts b/packages/memory-inspector/src/browser/memory-provider/memory-provider-service.ts index ca27d2ad07204..26d192da03b82 100644 --- a/packages/memory-inspector/src/browser/memory-provider/memory-provider-service.ts +++ b/packages/memory-inspector/src/browser/memory-provider/memory-provider-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContributionProvider } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/memory-provider/memory-provider.spec.ts b/packages/memory-inspector/src/browser/memory-provider/memory-provider.spec.ts index a46c3001fd880..acd67da2cfea2 100644 --- a/packages/memory-inspector/src/browser/memory-provider/memory-provider.spec.ts +++ b/packages/memory-inspector/src/browser/memory-provider/memory-provider.spec.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { expect } from 'chai'; diff --git a/packages/memory-inspector/src/browser/memory-provider/memory-provider.ts b/packages/memory-inspector/src/browser/memory-provider/memory-provider.ts index eef78ebcab12b..32d215f9e6ac2 100644 --- a/packages/memory-inspector/src/browser/memory-provider/memory-provider.ts +++ b/packages/memory-inspector/src/browser/memory-provider/memory-provider.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/memory-inspector/src/browser/memory-widget/memory-options-widget.tsx b/packages/memory-inspector/src/browser/memory-widget/memory-options-widget.tsx index e9bf582d326e4..9e95fcc03f32e 100644 --- a/packages/memory-inspector/src/browser/memory-widget/memory-options-widget.tsx +++ b/packages/memory-inspector/src/browser/memory-widget/memory-options-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { deepFreeze, Disposable, DisposableCollection, Emitter, nls } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/memory-widget/memory-table-widget.tsx b/packages/memory-inspector/src/browser/memory-widget/memory-table-widget.tsx index 1a2c5f719eb6e..3a650462b178d 100644 --- a/packages/memory-inspector/src/browser/memory-widget/memory-table-widget.tsx +++ b/packages/memory-inspector/src/browser/memory-widget/memory-table-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ContextMenuRenderer, ReactWidget, Widget } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/memory-widget/memory-widget.ts b/packages/memory-inspector/src/browser/memory-widget/memory-widget.ts index 497adbf68718f..41e4ef0aa50a5 100644 --- a/packages/memory-inspector/src/browser/memory-widget/memory-widget.ts +++ b/packages/memory-inspector/src/browser/memory-widget/memory-widget.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { nls } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/register-widget/register-filter-service.ts b/packages/memory-inspector/src/browser/register-widget/register-filter-service.ts index 9d9e5390b8a95..ef22d2d5adf16 100644 --- a/packages/memory-inspector/src/browser/register-widget/register-filter-service.ts +++ b/packages/memory-inspector/src/browser/register-widget/register-filter-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/memory-inspector/src/browser/register-widget/register-options-widget.tsx b/packages/memory-inspector/src/browser/register-widget/register-options-widget.tsx index 5b84c04ad4faa..68a611954f3c7 100644 --- a/packages/memory-inspector/src/browser/register-widget/register-options-widget.tsx +++ b/packages/memory-inspector/src/browser/register-widget/register-options-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Disposable, DisposableCollection, Emitter, nls } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/register-widget/register-table-widget.tsx b/packages/memory-inspector/src/browser/register-widget/register-table-widget.tsx index 4f1da24f68bf9..141dd5baefb56 100644 --- a/packages/memory-inspector/src/browser/register-widget/register-table-widget.tsx +++ b/packages/memory-inspector/src/browser/register-widget/register-table-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Key, KeyCode } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/register-widget/register-widget-types.ts b/packages/memory-inspector/src/browser/register-widget/register-widget-types.ts index 38c05baa7f1ae..7d1f60cab7bba 100644 --- a/packages/memory-inspector/src/browser/register-widget/register-widget-types.ts +++ b/packages/memory-inspector/src/browser/register-widget/register-widget-types.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { nls } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/register-widget/register-widget.css b/packages/memory-inspector/src/browser/register-widget/register-widget.css index 04a38104fc55f..49a9c40d81d66 100644 --- a/packages/memory-inspector/src/browser/register-widget/register-widget.css +++ b/packages/memory-inspector/src/browser/register-widget/register-widget.css @@ -11,24 +11,24 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .register-table-widget table.t-mv-view { - table-layout: fixed; - width: 100%; + table-layout: fixed; + width: 100%; } .register-table-widget table.t-mv-view td, .register-table-widget table.t-mv-view th { - overflow: hidden; - text-overflow: ellipsis; + overflow: hidden; + text-overflow: ellipsis; } .reg-options-widget .t-mv-group.view-group { - grid-template-columns: 3fr 2fr 30px; + grid-template-columns: 3fr 2fr 30px; } .reg-options-widget .multi-select-bar { - height:100%; + height: 100%; } diff --git a/packages/memory-inspector/src/browser/style/index.css b/packages/memory-inspector/src/browser/style/index.css index 21a16742c089b..3ff753660c4da 100644 --- a/packages/memory-inspector/src/browser/style/index.css +++ b/packages/memory-inspector/src/browser/style/index.css @@ -11,733 +11,729 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --memory-widget-disabled-opacity: 0.7; - --memory-widget-placeholder-text-line-height: 24px; + --memory-widget-disabled-opacity: 0.7; + --memory-widget-placeholder-text-line-height: 24px; } .memory-view-options-widget { - display: flex; - overflow: unset !important; + display: flex; + overflow: unset !important; } .memory-view-icon { - -webkit-mask: url('memory-view.svg'); - mask: url('memory-view.svg'); + -webkit-mask: url("memory-view.svg"); + mask: url("memory-view.svg"); } .register-view-icon { - -webkit-mask: url('register-view.svg'); - mask: url('register-view.svg'); + -webkit-mask: url("register-view.svg"); + mask: url("register-view.svg"); } .memory-view-icon.toolbar, .register-view-icon.toolbar { - display: inline-block; - background-color: var(--theia-settings-headerForeground); - mask-size: 16px 15px; - mask-repeat: no-repeat; - mask-position: center center; - -webkit-mask-size: 16px 15px; - -webkit-mask-repeat: no-repeat; - -webkit-mask-position: center center; - min-width: var(--theia-icon-size); - min-height: var(--theia-icon-size); - cursor: pointer; + display: inline-block; + background-color: var(--theia-settings-headerForeground); + mask-size: 16px 15px; + mask-repeat: no-repeat; + mask-position: center center; + -webkit-mask-size: 16px 15px; + -webkit-mask-repeat: no-repeat; + -webkit-mask-position: center center; + min-width: var(--theia-icon-size); + min-height: var(--theia-icon-size); + cursor: pointer; } .memory-lock-icon { - -webkit-mask: url('memory-lock.svg'); - mask: url('memory-lock.svg'); + -webkit-mask: url("memory-lock.svg"); + mask: url("memory-lock.svg"); } .register-lock-icon { - -webkit-mask: url('register-lock.svg'); - mask: url('register-lock.svg'); + -webkit-mask: url("register-lock.svg"); + mask: url("register-lock.svg"); } .t-mv-container { - display: flex; - flex-direction: column; - align-items: left; - box-sizing: border-box; - height: 100%; - width: 100%; - padding: 10px; - overflow: hidden; + display: flex; + flex-direction: column; + align-items: left; + box-sizing: border-box; + height: 100%; + width: 100%; + padding: 10px; + overflow: hidden; } .t-mv-container button:focus { - /* Fixes a padding issue when clicking a button */ - border: none; + /* Fixes a padding issue when clicking a button */ + border: none; } .memory-view-wrapper { - display: flex; - flex-direction: column; - + display: flex; + flex-direction: column; } .t-mv-memory-container { - display: flex; - flex-direction: column; - overflow: hidden; - background-color: var(--theia-editor-background); - height: 100%; - white-space: nowrap; + display: flex; + flex-direction: column; + overflow: hidden; + background-color: var(--theia-editor-background); + height: 100%; + white-space: nowrap; } .t-mv-memory-container:focus { - outline: none; + outline: none; } .t-mv-memory-container.frozen, .t-mv-memory-container.frozen:focus { - font-style: italic; - opacity: var(--memory-widget-disabled-opacity) !important; + font-style: italic; + opacity: var(--memory-widget-disabled-opacity) !important; } .t-mv-memory-fetch-error { - margin: var(--theia-ui-padding); - color: var(--theia-editorWarning-foreground); + margin: var(--theia-ui-padding); + color: var(--theia-editorWarning-foreground); } .t-mv-memory-fetch-error.show { - display: block; + display: block; } .t-mv-memory-fetch-error.hide { - display: none; + display: none; } .t-mv-header { - margin-top: var(--theia-ui-padding); - display: grid; - box-shadow: 0px 6px 5px -5px var(--theia-widget-shadow); - padding-bottom: var(--theia-ui-padding); + margin-top: var(--theia-ui-padding); + display: grid; + box-shadow: 0px 6px 5px -5px var(--theia-widget-shadow); + padding-bottom: var(--theia-ui-padding); } .t-mv-header-label { - background-color: var(--theia-editor-background); - border-radius: 10px; - font-weight: 400; - padding: 2px 5px 2px 5px; + background-color: var(--theia-editor-background); + border-radius: 10px; + font-weight: 400; + padding: 2px 5px 2px 5px; } .t-mv-view { - width: 100%; + width: 100%; } .t-mv-view .eight-bits.changed { - background-color: var(--theia-memoryInspector-foreground); - color: var(--theia-editor-background); + background-color: var(--theia-memoryInspector-foreground); + color: var(--theia-editor-background); } .t-mv-view .eight-bits.changed:hover { - background-color: var(--theia-memoryInspector-foreground); - opacity: .85; + background-color: var(--theia-memoryInspector-foreground); + opacity: 0.85; } .t-mv-view .eight-bits { - border-bottom: 1px solid transparent; - box-sizing: border-box; + border-bottom: 1px solid transparent; + box-sizing: border-box; } .t-mv-view .eight-bits:not(.changed):not(.highlight):hover { - background-color: var(--theia-editor-inactiveSelectionBackground); + background-color: var(--theia-editor-inactiveSelectionBackground); } .t-mv-memory-container:focus .eight-bits.highlight { - background-color: var(--theia-editor-selectionBackground); - border-radius: 1px; - border-bottom: solid 1px var(--theia-editorCursor-foreground); + background-color: var(--theia-editor-selectionBackground); + border-radius: 1px; + border-bottom: solid 1px var(--theia-editorCursor-foreground); } .t-mv-memory-container:focus .eight-bits.changed.highlight { - background-color: var(--theia-memoryInspector-focusBorder); + background-color: var(--theia-memoryInspector-focusBorder); } .t-mv-memory-container:not(:focus) .eight-bits.highlight { - background-color: var(--theia-editor-inactiveSelectionBackground); + background-color: var(--theia-editor-inactiveSelectionBackground); } .t-mv-view .eight-bits.modified { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - outline-color: var(--theia-editorWarning-foreground); - border: none; + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + outline-color: var(--theia-editorWarning-foreground); + border: none; } .t-mv-view .byte-group:not(:first-of-type) { - display: inline-block; - padding-left: var(--theia-ui-padding); + display: inline-block; + padding-left: var(--theia-ui-padding); } .t-mv-view .data-address-col { - width: unset; + width: unset; } .t-mv-view-container { - flex: 1; - overflow: hidden; - margin-top: var(--theia-ui-padding); - height: 100%; + flex: 1; + overflow: hidden; + margin-top: var(--theia-ui-padding); + height: 100%; } .t-mv-view-container thead { - position: absolute; + position: absolute; } .t-mv-view-container .ps__rail-y { - left: unset !important; + left: unset !important; } .t-mv-view-container:focus { - /* Fixes a padding issue when clicking inside the container */ - border: none; + /* Fixes a padding issue when clicking inside the container */ + border: none; } .memory-diff-select .theia-select:focus, .t-mv-container .theia-select:focus { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1 !important; - outline-color: var(--theia-focusBorder); + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + opacity: 1 !important; + outline-color: var(--theia-focusBorder); } .t-mv-settings-container { - flex: none; - padding-bottom: var(--theia-ui-padding); + flex: none; + padding-bottom: var(--theia-ui-padding); } .t-mv-settings-container .t-mv-settings-group-header { - padding-bottom: calc(var(--theia-ui-padding)/2); - border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); + padding-bottom: calc(var(--theia-ui-padding) / 2); + border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); } .memory-widget-toolbar { - display: flex; - flex-flow: row nowrap; - height: 24px; - align-items: center; - max-width: 100%; + display: flex; + flex-flow: row nowrap; + height: 24px; + align-items: center; + max-width: 100%; } .memory-widget-toolbar * { - flex: none; + flex: none; } .memory-widget-toolbar .memory-widget-header-click-zone { - min-width: 0; + min-width: 0; } .memory-widget-header-click-zone * { - flex: none; + flex: none; } .memory-widget-auto-updates-container { - width: 16px; - margin-right: var(--theia-ui-padding); - font-size: 1.3em; + width: 16px; + margin-right: var(--theia-ui-padding); + font-size: 1.3em; } - .toggle-settings-container { - margin-left: auto; + margin-left: auto; } .toggle-settings-container .toggle-settings-click-zone { - display: flex; - align-items: center; - justify-content: flex-end; - margin-left: var(--theia-ui-padding); - user-select: none; - box-sizing: content-box; - border-top: 1px solid transparent; + display: flex; + align-items: center; + justify-content: flex-end; + margin-left: var(--theia-ui-padding); + user-select: none; + box-sizing: content-box; + border-top: 1px solid transparent; } .toggle-settings-container .toggle-settings-click-zone:focus { - outline: none; - border-top: 1px solid var(--theia-focusBorder); + outline: none; + border-top: 1px solid var(--theia-focusBorder); } .toggle-settings-container .toggle-settings-click-zone span { - white-space: nowrap; + white-space: nowrap; } .toggle-settings-container .codicon-settings-gear { - font-size: 1.1em; - margin-right: var(--theia-ui-padding); + font-size: 1.1em; + margin-right: var(--theia-ui-padding); } -.toggle-settings-container+div>.t-mv-settings-group-header:first-of-type, -.toggle-settings-container+.t-mv-settings-group-header { - margin-top: 0; +.toggle-settings-container + div > .t-mv-settings-group-header:first-of-type, +.toggle-settings-container + .t-mv-settings-group-header { + margin-top: 0; } - .t-mv-wrapper button.theia-button { - min-width: 30px; - margin: unset; - padding: unset; + min-width: 30px; + margin: unset; + padding: unset; } .view-group { - grid-template-columns: 70px 1fr; + grid-template-columns: 70px 1fr; } .settings-group { - grid-template-columns: 110px 1fr; - margin-top: calc(2 * var(--theia-ui-padding)); + grid-template-columns: 110px 1fr; + margin-top: calc(2 * var(--theia-ui-padding)); } .ascii-group { - grid-template-columns: 70px 1fr; + grid-template-columns: 70px 1fr; } .t-mv-group.view-group { - grid-template-columns: 3fr repeat(2, 1fr) 30px; - grid-template-rows: repeat(2, 24px); - grid-auto-flow: column; - border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); - border-top: 1px solid hsla(0, 0%, 50%, 0.5); - padding-bottom: var(--theia-ui-padding); + grid-template-columns: 3fr repeat(2, 1fr) 30px; + grid-template-rows: repeat(2, 24px); + grid-auto-flow: column; + border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); + border-top: 1px solid hsla(0, 0%, 50%, 0.5); + padding-bottom: var(--theia-ui-padding); } .view-group-go-button { - grid-row: 2 / 3; - height: 100%; + grid-row: 2 / 3; + height: 100%; } .t-mv-group { - display: grid; - grid-column-gap: var(--theia-ui-padding); - grid-row-gap: calc(var(--theia-ui-padding)/2); - align-items: center; + display: grid; + grid-column-gap: var(--theia-ui-padding); + grid-row-gap: calc(var(--theia-ui-padding) / 2); + align-items: center; } .t-mv-group .theia-select, .t-mv-group .theia-input { - width: 100%; - box-sizing: border-box; + width: 100%; + box-sizing: border-box; } .t-mv-group .multi-select-bar { - min-height: 19px; + min-height: 19px; } .t-mv-group .multi-select-label { - line-height: 17px; + line-height: 17px; } .t-mv-input-group.button-wrapper { - margin: 2px; - width: 100%; - display: block; - text-align: center; + margin: 2px; + width: 100%; + display: block; + text-align: center; } .t-mv-input-group.button-wrapper .theia-button.main { - margin: var(--theia-ui-padding) 0 0 0; + margin: var(--theia-ui-padding) 0 0 0; } table.t-mv-view { - align-self: center; - border-collapse: collapse; - border: none; + align-self: center; + border-collapse: collapse; + border: none; } table.t-mv-view { - font-size: var(--theia-ui-font-size1); - font-weight: 400; - text-align: left; - padding: 10px; + font-size: var(--theia-ui-font-size1); + font-weight: 400; + text-align: left; + padding: 10px; } table.t-mv-view td, table.t-mv-view th { - font-family: monospace; - padding-right: 15px; - white-space: pre; + font-family: monospace; + padding-right: 15px; + white-space: pre; } table.t-mv-view .t-mv-view-row.t-mv-view-row-highlight { - border-bottom: 1px var(--theia-editorGroup-border) solid; + border-bottom: 1px var(--theia-editorGroup-border) solid; } table.t-mv-view .t-mv-view-row:hover { - background-color: var(--theia-sideBar-background); + background-color: var(--theia-sideBar-background); } table.t-mv-view .t-mv-view-address { - font-weight: 700; - text-align: left; + font-weight: 700; + text-align: left; } .t-mv-settings-group-header.small-margin { - margin-bottom: var(--theia-ui-padding); - margin-top: var(--theia-ui-padding); + margin-bottom: var(--theia-ui-padding); + margin-top: var(--theia-ui-padding); } .t-mv-variable-label:not(:last-of-type)::after { - content: ','; - margin-right: var(--theia-ui-padding); - color: var(--theia-editor-foreground); + content: ","; + margin-right: var(--theia-ui-padding); + color: var(--theia-editor-foreground); } .mw-input-select { - position: relative; - height: 100%; + position: relative; + height: 100%; } .mw-input-select .theia-input { - position: absolute; - z-index: 1; - width: calc(100% - 18px); + position: absolute; + z-index: 1; + width: calc(100% - 18px); } .mw-input-select .theia-input:focus { - outline: unset; + outline: unset; } .mw-input-select .theia-select { - position: absolute; - z-index: 0; - height: calc(var(--theia-content-line-height) + 2px); + position: absolute; + z-index: 0; + height: calc(var(--theia-content-line-height) + 2px); } .mw-input-select .theia-select:focus { - outline: unset; + outline: unset; } .memory-layout-widget { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .memory-dock-panel { - flex-grow: 1; - margin: var(--theia-ui-padding); - margin-top: 0; + flex-grow: 1; + margin: var(--theia-ui-padding); + margin-top: 0; } .memory-edit-button-container { - padding: var(--theia-ui-padding) 0; - width: 100%; - display: flex; - justify-content: center; - box-shadow: 0px 6px 6px 6px var(--theia-widget-shadow); + padding: var(--theia-ui-padding) 0; + width: 100%; + display: flex; + justify-content: center; + box-shadow: 0px 6px 6px 6px var(--theia-widget-shadow); } .memory-edit-button-container .memory-edit-error { - width: 100%; - height: 100%; - bottom: 0; - box-sizing: border-box; - white-space: normal; - padding: var(--theia-ui-padding); - background-color: var(--theia-editor-background); - color: var(--theia-editorWarning-foreground); + width: 100%; + height: 100%; + bottom: 0; + box-sizing: border-box; + white-space: normal; + padding: var(--theia-ui-padding); + background-color: var(--theia-editor-background); + color: var(--theia-editorWarning-foreground); } .memory-diff-select { - padding: var(--theia-ui-padding); + padding: var(--theia-ui-padding); } .memory-diff-select-wrapper { - display: flex; - flex-flow: row wrap; - justify-content: center; - align-content: center; - align-items: center; - border-top: 1px solid hsla(0, 0%, 50%, 0.5); - padding-top: var(--theia-ui-padding); + display: flex; + flex-flow: row wrap; + justify-content: center; + align-content: center; + align-items: center; + border-top: 1px solid hsla(0, 0%, 50%, 0.5); + padding-top: var(--theia-ui-padding); } .diff-select-input-wrapper { - display: flex; - justify-content: space-around; - align-content: center; - align-items: center; - flex-flow: row wrap; + display: flex; + justify-content: space-around; + align-content: center; + align-items: center; + flex-flow: row wrap; } .memory-diff-select-go { - min-width: unset; - text-align: center; - width: 30px; - margin: 0 var(--theia-ui-padding); - margin-top: var(--theia-ui-padding); - align-self: flex-end; + min-width: unset; + text-align: center; + width: 30px; + margin: 0 var(--theia-ui-padding); + margin-top: var(--theia-ui-padding); + align-self: flex-end; } .t-mv-diff-select-widget-options-wrapper { - display: grid; - grid-template-rows: 12px 24px; - grid-auto-flow: column; - gap: calc(var(--theia-ui-padding)/2); - max-width: 215px; - margin: 0 var(--theia-ui-padding); - align-items: center; + display: grid; + grid-template-rows: 12px 24px; + grid-auto-flow: column; + gap: calc(var(--theia-ui-padding) / 2); + max-width: 215px; + margin: 0 var(--theia-ui-padding); + align-items: center; } .t-mv-diff-select-widget-options-wrapper .t-mv-label, .t-mv-diff-select-widget-options-wrapper .t-mv-select { - min-width: 0; + min-width: 0; } .t-mv-diff-select-widget-options-wrapper .t-mv-select { - height: 100%; + height: 100%; } .theia-input:disabled { - opacity: var(--memory-widget-disabled-opacity); + opacity: var(--memory-widget-disabled-opacity); } .t-mv-label.disabled { - font-style: italic; - opacity: var(--memory-widget-disabled-opacity); + font-style: italic; + opacity: var(--memory-widget-disabled-opacity); } .memory-widget-header { - font-weight: normal; + font-weight: normal; } .memory-widget-header-click-zone { - display: flex; - flex: 1 1 0; - align-items: center; + display: flex; + flex: 1 1 0; + align-items: center; } - .memory-widget-header-click-zone .memory-widget-header { - margin: 0; - white-space: nowrap; - flex-shrink: 1; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; + margin: 0; + white-space: nowrap; + flex-shrink: 1; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; } .memory-widget-header-click-zone input { - flex-grow: 1; - width: 0; - height: 18px; + flex-grow: 1; + width: 0; + height: 18px; } .memory-widget-toolbar .fa.fa-pencil, .memory-widget-toolbar .fa.fa-save { - font-size: 1.2em; - margin: 0 var(--theia-ui-padding); - transition: opacity 0.3s; + font-size: 1.2em; + margin: 0 var(--theia-ui-padding); + transition: opacity 0.3s; } .memory-widget-header-click-zone:hover .fa.fa-pencil { - opacity: 1; + opacity: 1; } .memory-widget-header-click-zone .fa.fa-pencil { - opacity: 0; + opacity: 0; } .memory-widget-header-click-zone .theia-input { - font-size: 1.5em; - /* same as theia h2 */ + font-size: 1.5em; + /* same as theia h2 */ } .t-mv-settings-group-header.disabled, .memory-widget-header.disabled { - font-style: italic; - opacity: var(--memory-widget-disabled-opacity); + font-style: italic; + opacity: var(--memory-widget-disabled-opacity); } .t-mv-view-container span { - display: inline-block; + display: inline-block; } .t-mv-diffed-ascii:not(:last-of-type) { - margin-right: var(--theia-ui-padding); + margin-right: var(--theia-ui-padding); } .t-mv-view-container span.different { - position: relative; + position: relative; } .t-mv-view-container span.different::before { - content: ''; - position: absolute; - height: 100%; - width: 100%; - top: 0; - left: 0; + content: ""; + position: absolute; + height: 100%; + width: 100%; + top: 0; + left: 0; } .t-mv-view-container span.before.different::before, .t-mv-view-container .before.different { - background-color: var(--theia-memoryDiff-removedTextBackground); + background-color: var(--theia-memoryDiff-removedTextBackground); } .t-mv-view-container span.after.different::before, .t-mv-view-container .after.different { - background-color: var(--theia-memoryDiff-insertedTextBackground); + background-color: var(--theia-memoryDiff-insertedTextBackground); } .t-mv-view-container span.before.different.hc::before, .t-mv-view-container .before.different.hc { - border-top: dotted 1px var(--theia-contrastActiveBorder); - border-bottom: dotted 1px var(--theia-contrastActiveBorder); - box-sizing: border-box; + border-top: dotted 1px var(--theia-contrastActiveBorder); + border-bottom: dotted 1px var(--theia-contrastActiveBorder); + box-sizing: border-box; } .t-mv-view-container span.after.different.hc::before, .t-mv-view-container .after.different.hc { - border-top: dashed 1px var(--theia-contrastBorder); - border-bottom: dashed 1px var(--theia-contrastBorder); - box-sizing: border-box; + border-top: dashed 1px var(--theia-contrastBorder); + border-bottom: dashed 1px var(--theia-contrastBorder); + box-sizing: border-box; } .memory-dockpanel-placeholder { - position: absolute; - top: 10px; - padding: calc(2 * var(--theia-ui-padding)); - width: 100%; - line-height: var(--memory-widget-placeholder-text-line-height); + position: absolute; + top: 10px; + padding: calc(2 * var(--theia-ui-padding)); + width: 100%; + line-height: var(--memory-widget-placeholder-text-line-height); } .memory-dockpanel-placeholder i.toolbar { - background-color: var(--theia-errorForeground); - vertical-align: middle; - cursor: default; + background-color: var(--theia-errorForeground); + vertical-align: middle; + cursor: default; } .t-mv-hover { - position: fixed; - font-family: monospace; - box-sizing: border-box; - padding: var(--theia-ui-padding); - font-size: var(--theia-ui-font-size1); - background: var(--theia-editorHoverWidget-background); - border: 2px solid var(--theia-editorHoverWidget-border); - /* This ensures that the hover is visible over the widget even when focused */ - z-index: 1000; + position: fixed; + font-family: monospace; + box-sizing: border-box; + padding: var(--theia-ui-padding); + font-size: var(--theia-ui-font-size1); + background: var(--theia-editorHoverWidget-background); + border: 2px solid var(--theia-editorHoverWidget-border); + /* This ensures that the hover is visible over the widget even when focused */ + z-index: 1000; - display: grid; - grid-template-columns: max-content max-content; - gap: calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding); + display: grid; + grid-template-columns: max-content max-content; + gap: calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding); } .t-mv-hover.hidden { - display: none; + display: none; } .t-mv-hover-key { - color: var(--theia-symbolIcon-variableForeground); + color: var(--theia-symbolIcon-variableForeground); } .t-mv-hover-value { - color: var(--theia-variable-number-variable-color); + color: var(--theia-variable-number-variable-color); } .t-mv-hover-value.utf8 { - color: var(--theia-variable-string-variable-color); + color: var(--theia-variable-string-variable-color); } .mw-more-memory-select { - display: flex; - justify-content: center; - align-items: center; - font-style: italic; - opacity: 0.7; + display: flex; + justify-content: center; + align-items: center; + font-style: italic; + opacity: 0.7; } .mw-more-memory-select-top { - display: flex; - justify-content: center; - height: 16px; - padding-bottom: 1px; - transition: border-color .1s; - border-color: transparent; - + display: flex; + justify-content: center; + height: 16px; + padding-bottom: 1px; + transition: border-color 0.1s; + border-color: transparent; } .mw-more-memory-select-top:hover { - border-bottom: 1px solid; - padding-bottom: 0; - border-color: var(--theia-sideBar-foreground); + border-bottom: 1px solid; + padding-bottom: 0; + border-color: var(--theia-sideBar-foreground); } .mw-more-memory-select select { - border: none; - background: none; - border-radius: 3px; - margin: 0 2px; - position: relative; - bottom: 1px; - transition: background .1s; - font-style: italic; + border: none; + background: none; + border-radius: 3px; + margin: 0 2px; + position: relative; + bottom: 1px; + transition: background 0.1s; + font-style: italic; } .mw-more-memory-select select:hover { - background: var(--theia-dropdown-background); + background: var(--theia-dropdown-background); } - .mw-more-memory-select button { - background-color: unset; - border: none; - padding: 2px; - color: var(--theia-sideBar-foreground); + background-color: unset; + border: none; + padding: 2px; + color: var(--theia-sideBar-foreground); } .mw-bookmarks-bar { - padding: calc(var(--theia-ui-padding) / 2) 0; + padding: calc(var(--theia-ui-padding) / 2) 0; } .mw-bookmarks-bar .bookmark-container { - display: inline; - position: relative; - cursor: pointer; - padding: 0 var(--theia-ui-padding); + display: inline; + position: relative; + cursor: pointer; + padding: 0 var(--theia-ui-padding); } .mw-bookmarks-bar .bookmark-container .bookmark-radio-button { - height: 100%; - z-index: -1; - border-radius: 3px; - padding: 0 var(--theia-ui-padding); - background-color: var(--theia-button-secondaryBackground); - color: var(--theia-button-secondaryForeground); - box-shadow: 0 2px 0 rgba(187, 187, 187, 0.4); + height: 100%; + z-index: -1; + border-radius: 3px; + padding: 0 var(--theia-ui-padding); + background-color: var(--theia-button-secondaryBackground); + color: var(--theia-button-secondaryForeground); + box-shadow: 0 2px 0 rgba(187, 187, 187, 0.4); } .mw-bookmarks-bar input { - position: absolute; - left: 0; - appearance: none; - -webkit-appearance: none; + position: absolute; + left: 0; + appearance: none; + -webkit-appearance: none; } -.mw-bookmarks-bar input:checked~.bookmark-radio-button { - background-color: var(--theia-button-background); - color: var(--theia-button-foreground); +.mw-bookmarks-bar input:checked ~ .bookmark-radio-button { + background-color: var(--theia-button-background); + color: var(--theia-button-foreground); } .diff-options-widget .t-mv-group.view-group { - grid-template-columns: repeat(2, 1fr) 30px; - grid-template-rows: 18px 24px; + grid-template-columns: repeat(2, 1fr) 30px; + grid-template-rows: 18px 24px; } #memory-table-widget.editable .t-mv-view .eight-bits:hover { - cursor: pointer; + cursor: pointer; } -#memory-table-widget.editable .t-mv-memory-container:focus .eight-bits.highlight { - cursor: text; +#memory-table-widget.editable + .t-mv-memory-container:focus + .eight-bits.highlight { + cursor: text; } .diff-options-widget .memory-widget-header-click-zone, @@ -746,5 +742,5 @@ table.t-mv-view .t-mv-view-address { #memory-layout-widget .toggle-settings-click-zone, #memory-layout-widget .fa-unlock, #memory-layout-widget .fa-lock { - cursor: pointer; + cursor: pointer; } diff --git a/packages/memory-inspector/src/browser/style/memory-lock.svg b/packages/memory-inspector/src/browser/style/memory-lock.svg index 6a068b5e8769c..4372a0771db9e 100644 --- a/packages/memory-inspector/src/browser/style/memory-lock.svg +++ b/packages/memory-inspector/src/browser/style/memory-lock.svg @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/packages/memory-inspector/src/browser/style/memory-view.svg b/packages/memory-inspector/src/browser/style/memory-view.svg index 860b0d80326ad..ab3632acb0892 100644 --- a/packages/memory-inspector/src/browser/style/memory-view.svg +++ b/packages/memory-inspector/src/browser/style/memory-view.svg @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/packages/memory-inspector/src/browser/style/register-lock.svg b/packages/memory-inspector/src/browser/style/register-lock.svg index ff1bed7c1443e..796cb3bc5de70 100644 --- a/packages/memory-inspector/src/browser/style/register-lock.svg +++ b/packages/memory-inspector/src/browser/style/register-lock.svg @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/packages/memory-inspector/src/browser/style/register-view.svg b/packages/memory-inspector/src/browser/style/register-view.svg index 59c6db11208e6..1a2961a016799 100644 --- a/packages/memory-inspector/src/browser/style/register-view.svg +++ b/packages/memory-inspector/src/browser/style/register-view.svg @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ --> diff --git a/packages/memory-inspector/src/browser/utils/memory-commands.ts b/packages/memory-inspector/src/browser/utils/memory-commands.ts index 0266be1262696..f526e81d8216b 100644 --- a/packages/memory-inspector/src/browser/utils/memory-commands.ts +++ b/packages/memory-inspector/src/browser/utils/memory-commands.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Command } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/utils/memory-hover-renderer.ts b/packages/memory-inspector/src/browser/utils/memory-hover-renderer.ts index 74ecb857234cb..2bcf770fde27e 100644 --- a/packages/memory-inspector/src/browser/utils/memory-hover-renderer.ts +++ b/packages/memory-inspector/src/browser/utils/memory-hover-renderer.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Disposable } from '@theia/core'; diff --git a/packages/memory-inspector/src/browser/utils/memory-recents.ts b/packages/memory-inspector/src/browser/utils/memory-recents.ts index c28844dfccdaa..6909af0a5ff18 100644 --- a/packages/memory-inspector/src/browser/utils/memory-recents.ts +++ b/packages/memory-inspector/src/browser/utils/memory-recents.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* diff --git a/packages/memory-inspector/src/browser/utils/memory-widget-components.tsx b/packages/memory-inspector/src/browser/utils/memory-widget-components.tsx index 6855d0316537b..a88051209a631 100644 --- a/packages/memory-inspector/src/browser/utils/memory-widget-components.tsx +++ b/packages/memory-inspector/src/browser/utils/memory-widget-components.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Key, KeyCode } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/utils/memory-widget-manager.ts b/packages/memory-inspector/src/browser/utils/memory-widget-manager.ts index 3f8d646bd3b6c..93db4b9fa388f 100644 --- a/packages/memory-inspector/src/browser/utils/memory-widget-manager.ts +++ b/packages/memory-inspector/src/browser/utils/memory-widget-manager.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Disposable, DisposableCollection, Emitter, MessageService } from '@theia/core'; import { ApplicationShell, OpenViewArguments, WidgetManager } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/utils/memory-widget-utils.tsx b/packages/memory-inspector/src/browser/utils/memory-widget-utils.tsx index 9c43486aeded4..3b88978099884 100644 --- a/packages/memory-inspector/src/browser/utils/memory-widget-utils.tsx +++ b/packages/memory-inspector/src/browser/utils/memory-widget-utils.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import * as Long from 'long'; diff --git a/packages/memory-inspector/src/browser/utils/memory-widget-variable-utils.ts b/packages/memory-inspector/src/browser/utils/memory-widget-variable-utils.ts index cef1f9475bc57..95dfe3049ce14 100644 --- a/packages/memory-inspector/src/browser/utils/memory-widget-variable-utils.ts +++ b/packages/memory-inspector/src/browser/utils/memory-widget-variable-utils.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { DebugScope, DebugVariable } from '@theia/debug/lib/browser/console/debug-console-items'; diff --git a/packages/memory-inspector/src/browser/utils/multi-select-bar.css b/packages/memory-inspector/src/browser/utils/multi-select-bar.css index 5c387f776df2c..7bb2fe3be5951 100644 --- a/packages/memory-inspector/src/browser/utils/multi-select-bar.css +++ b/packages/memory-inspector/src/browser/utils/multi-select-bar.css @@ -11,52 +11,51 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .multi-select-bar { - display: flex; - flex-flow: row nowrap; - user-select: none; - box-sizing: border-box; + display: flex; + flex-flow: row nowrap; + user-select: none; + box-sizing: border-box; } .multi-select-checkbox-wrapper { - display: flex; - position: relative; - flex: auto; - text-align: center; + display: flex; + position: relative; + flex: auto; + text-align: center; } .multi-select-label { - height: 100%; - flex: auto; - display: flex; - align-items: center; - justify-content: center; - border: 1px solid; - padding: 0 var(--theia-ui-padding); - background-color: var(--theia-editor-background); - border-color: var(--theia-dropdown-border); - box-sizing: border-box; + height: 100%; + flex: auto; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid; + padding: 0 var(--theia-ui-padding); + background-color: var(--theia-editor-background); + border-color: var(--theia-dropdown-border); + box-sizing: border-box; } .multi-select-checkbox-wrapper input:checked ~ .multi-select-label { - background-color: var(--theia-input-background); - border-color: var(--theia-sideBar-foreground); - text-decoration: underline; - font-weight: bolder; + background-color: var(--theia-input-background); + border-color: var(--theia-sideBar-foreground); + text-decoration: underline; + font-weight: bolder; } - .multi-select-checkbox { - appearance: none; - -webkit-appearance: none; - position: absolute; - left: 0; - top: 0; - margin: 0; - height: 100%; - width: 100%; - cursor: pointer; + appearance: none; + -webkit-appearance: none; + position: absolute; + left: 0; + top: 0; + margin: 0; + height: 100%; + width: 100%; + cursor: pointer; } diff --git a/packages/memory-inspector/src/browser/utils/multi-select-bar.tsx b/packages/memory-inspector/src/browser/utils/multi-select-bar.tsx index e0ec4e6cba19b..97948552b96bb 100644 --- a/packages/memory-inspector/src/browser/utils/multi-select-bar.tsx +++ b/packages/memory-inspector/src/browser/utils/multi-select-bar.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import * as React from '@theia/core/shared/react'; diff --git a/packages/memory-inspector/src/browser/wrapper-widgets/memory-dock-panel.ts b/packages/memory-inspector/src/browser/wrapper-widgets/memory-dock-panel.ts index 4e42eaf49f296..f4755fa15feeb 100644 --- a/packages/memory-inspector/src/browser/wrapper-widgets/memory-dock-panel.ts +++ b/packages/memory-inspector/src/browser/wrapper-widgets/memory-dock-panel.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { DockPanelRendererFactory } from '@theia/core/lib/browser'; diff --git a/packages/memory-inspector/src/browser/wrapper-widgets/memory-dockpanel-placeholder-widget.tsx b/packages/memory-inspector/src/browser/wrapper-widgets/memory-dockpanel-placeholder-widget.tsx index 278e99c9550de..e39d45e77d741 100644 --- a/packages/memory-inspector/src/browser/wrapper-widgets/memory-dockpanel-placeholder-widget.tsx +++ b/packages/memory-inspector/src/browser/wrapper-widgets/memory-dockpanel-placeholder-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { ReactWidget } from '@theia/core/lib/browser'; import { injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/memory-inspector/src/browser/wrapper-widgets/memory-layout-widget.tsx b/packages/memory-inspector/src/browser/wrapper-widgets/memory-layout-widget.tsx index 2a92de2327ddf..b37aee0da1ba3 100644 --- a/packages/memory-inspector/src/browser/wrapper-widgets/memory-layout-widget.tsx +++ b/packages/memory-inspector/src/browser/wrapper-widgets/memory-layout-widget.tsx @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { Disposable, DisposableCollection, Emitter, nls } from '@theia/core'; diff --git a/packages/memory-inspector/src/common/util.ts b/packages/memory-inspector/src/common/util.ts index 2245038015fd5..c7ff377128f45 100644 --- a/packages/memory-inspector/src/common/util.ts +++ b/packages/memory-inspector/src/common/util.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import * as Long from 'long'; diff --git a/packages/memory-inspector/src/common/utils.spec.ts b/packages/memory-inspector/src/common/utils.spec.ts index 7c8cc6dce1164..410e05389f338 100644 --- a/packages/memory-inspector/src/common/utils.spec.ts +++ b/packages/memory-inspector/src/common/utils.spec.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { hexStrToUnsignedLong } from './util'; diff --git a/packages/messages/package.json b/packages/messages/package.json index 004f0eb2e058a..d87f9ea58a97b 100644 --- a/packages/messages/package.json +++ b/packages/messages/package.json @@ -18,7 +18,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/messages/src/browser/messages-frontend-module.ts b/packages/messages/src/browser/messages-frontend-module.ts index 497fd756d5625..2367036f8f8df 100644 --- a/packages/messages/src/browser/messages-frontend-module.ts +++ b/packages/messages/src/browser/messages-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/messages/src/browser/notification-center-component.tsx b/packages/messages/src/browser/notification-center-component.tsx index 01030da486bf3..c49779e536853 100644 --- a/packages/messages/src/browser/notification-center-component.tsx +++ b/packages/messages/src/browser/notification-center-component.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/messages/src/browser/notification-component.tsx b/packages/messages/src/browser/notification-component.tsx index a22805b67df47..c1805b0cec724 100644 --- a/packages/messages/src/browser/notification-component.tsx +++ b/packages/messages/src/browser/notification-component.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/messages/src/browser/notification-content-renderer.spec.ts b/packages/messages/src/browser/notification-content-renderer.spec.ts index 6618670d8c436..19b3bde1ac26f 100644 --- a/packages/messages/src/browser/notification-content-renderer.spec.ts +++ b/packages/messages/src/browser/notification-content-renderer.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/messages/src/browser/notification-content-renderer.ts b/packages/messages/src/browser/notification-content-renderer.ts index 40abe855971d3..4fde3ff2271a5 100644 --- a/packages/messages/src/browser/notification-content-renderer.ts +++ b/packages/messages/src/browser/notification-content-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as markdownit from '@theia/core/shared/markdown-it'; diff --git a/packages/messages/src/browser/notification-preferences.ts b/packages/messages/src/browser/notification-preferences.ts index 315dee85ab431..92b2e03732dce 100644 --- a/packages/messages/src/browser/notification-preferences.ts +++ b/packages/messages/src/browser/notification-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/messages/src/browser/notification-toasts-component.tsx b/packages/messages/src/browser/notification-toasts-component.tsx index 995d11602309a..b6f81bd5addd2 100644 --- a/packages/messages/src/browser/notification-toasts-component.tsx +++ b/packages/messages/src/browser/notification-toasts-component.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/messages/src/browser/notifications-commands.ts b/packages/messages/src/browser/notifications-commands.ts index 104fa2e433767..2cfd82a0daf93 100644 --- a/packages/messages/src/browser/notifications-commands.ts +++ b/packages/messages/src/browser/notifications-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, nls } from '@theia/core'; diff --git a/packages/messages/src/browser/notifications-contribution.ts b/packages/messages/src/browser/notifications-contribution.ts index c20149ece2022..520cb74f4ec46 100644 --- a/packages/messages/src/browser/notifications-contribution.ts +++ b/packages/messages/src/browser/notifications-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/messages/src/browser/notifications-manager.ts b/packages/messages/src/browser/notifications-manager.ts index b4068e6cd8580..de372b245e8b3 100644 --- a/packages/messages/src/browser/notifications-manager.ts +++ b/packages/messages/src/browser/notifications-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/messages/src/browser/notifications-renderer.tsx b/packages/messages/src/browser/notifications-renderer.tsx index e024f937afa09..7ded45ae762ec 100644 --- a/packages/messages/src/browser/notifications-renderer.tsx +++ b/packages/messages/src/browser/notifications-renderer.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/messages/src/browser/style/index.css b/packages/messages/src/browser/style/index.css index 1d0a1a9d57817..49615ac2f0b2c 100644 --- a/packages/messages/src/browser/style/index.css +++ b/packages/messages/src/browser/style/index.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import './notifications.css'; +@import "./notifications.css"; diff --git a/packages/messages/src/browser/style/notifications.css b/packages/messages/src/browser/style/notifications.css index 4fe991346cb4a..9de8ce092aaba 100644 --- a/packages/messages/src/browser/style/notifications.css +++ b/packages/messages/src/browser/style/notifications.css @@ -11,260 +11,269 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* Container */ .theia-notifications-overlay { - height: 0px; + height: 0px; } .theia-notifications-container { - position: absolute; - bottom: 36px; - right: 16px; - width: 500px; - user-select: none; - z-index: 1111; + position: absolute; + bottom: 36px; + right: 16px; + width: 500px; + user-select: none; + z-index: 1111; } .theia-notifications-container.closed { - display: none; + display: none; } .theia-notifications-container > * { - position: relative; + position: relative; } /* Toasts */ -.theia-notifications-container.theia-notification-toasts .theia-notification-list-item-container { - margin-top: 6px; +.theia-notifications-container.theia-notification-toasts + .theia-notification-list-item-container { + margin-top: 6px; } -.theia-notifications-container.theia-notification-toasts .theia-notification-list-item { - box-shadow: 0px 0px 4px 0px var(--theia-widget-shadow); - border: 1px solid var(--theia-notificationToast-border); +.theia-notifications-container.theia-notification-toasts + .theia-notification-list-item { + box-shadow: 0px 0px 4px 0px var(--theia-widget-shadow); + border: 1px solid var(--theia-notificationToast-border); } /* Center */ .theia-notifications-container.theia-notification-center { - background-color: var(--theia-notifications-background); - border: 1px solid var(--theia-notificationCenter-border); - box-shadow: 0px 0px 6px 0px var(--theia-widget-shadow); + background-color: var(--theia-notifications-background); + border: 1px solid var(--theia-notificationCenter-border); + box-shadow: 0px 0px 6px 0px var(--theia-widget-shadow); } /* Center > Header */ .theia-notification-center-header { - color: var(--theia-notificationCenterHeader-foreground); - background-color: var(--theia-notificationCenterHeader-background); - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: flex-end; - min-height: 30px; - align-items: center; + color: var(--theia-notificationCenterHeader-foreground); + background-color: var(--theia-notificationCenterHeader-background); + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-end; + min-height: 30px; + align-items: center; } .theia-notification-center-header-title { - font-size: calc(var(--theia-ui-font-size1) / 1.1); - font-family: var(--theia-ui-font-family); - margin: 8px; - flex-grow: 2; + font-size: calc(var(--theia-ui-font-size1) / 1.1); + font-family: var(--theia-ui-font-family); + margin: 8px; + flex-grow: 2; } .theia-notification-center-header-actions { - margin: 8px; + margin: 8px; } /* List */ .theia-notification-list-scroll-container { - max-height: 300px; - overflow: auto; + max-height: 300px; + overflow: auto; } .theia-notification-list { - display: flex; - flex-direction: column-reverse; - flex-wrap: nowrap; + display: flex; + flex-direction: column-reverse; + flex-wrap: nowrap; } - /* List > Item */ .theia-notification-list-item { - background-color: var(--theia-notifications-background); - width: 100%; - cursor: pointer; - flex-grow: 1; - display: flex; - flex-direction: column; - flex-wrap: nowrap; - justify-content: space-between; + background-color: var(--theia-notifications-background); + width: 100%; + cursor: pointer; + flex-grow: 1; + display: flex; + flex-direction: column; + flex-wrap: nowrap; + justify-content: space-between; } .theia-notification-list-item:focus { - border-color: var(--theia-focusBorder); + border-color: var(--theia-focusBorder); } .theia-notification-center .theia-notification-list-item:not(:last-child) { - border-top: 1px var(--theia-notifications-border) solid; + border-top: 1px var(--theia-notifications-border) solid; } .theia-notification-list-item-content { - margin: 6px; - flex-grow: 3; + margin: 6px; + flex-grow: 3; } -.theia-notification-list-item-content.collapsed .theia-notification-list-item-content-bottom { - display: none; +.theia-notification-list-item-content.collapsed + .theia-notification-list-item-content-bottom { + display: none; } .theia-notification-list-item-content.collapsed .theia-notification-message { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .theia-notification-list-item-content-main { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: space-between; - padding: 5px 4px 7px 4px; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + padding: 5px 4px 7px 4px; } .theia-notification-message { - font-size: var(--theia-ui-font-size1); - font-family: var(--theia-ui-font-family); - overflow-wrap: break-word; - box-sizing: border-box; - flex-basis: 0%; - flex-grow: 1; - flex-shrink: 1; - display: block; - overflow: hidden; - user-select: text; - margin-top: 3px; + font-size: var(--theia-ui-font-size1); + font-family: var(--theia-ui-font-family); + overflow-wrap: break-word; + box-sizing: border-box; + flex-basis: 0%; + flex-grow: 1; + flex-shrink: 1; + display: block; + overflow: hidden; + user-select: text; + margin-top: 3px; } .theia-notification-message a { - border: none; - color: var(--theia-notificationLink-foreground); - outline: 0; - text-decoration: none; + border: none; + color: var(--theia-notificationLink-foreground); + outline: 0; + text-decoration: none; } .theia-notification-message a:focus { - outline-color: var(--theia-focusBorder); + outline-color: var(--theia-focusBorder); } .theia-notification-icon { - margin-top: 1px; + margin-top: 1px; } .theia-notification-icon:before { - font-size: 18px; - padding-right: 4px; + font-size: 18px; + padding-right: 4px; } .theia-notification-icon.info:before { - color: var(--theia-notificationsInfoIcon-foreground); + color: var(--theia-notificationsInfoIcon-foreground); } .theia-notification-icon.warning:before { - color: var(--theia-notificationsWarningIcon-foreground); + color: var(--theia-notificationsWarningIcon-foreground); } .theia-notification-icon.error:before { - color: var(--theia-notificationsErrorIcon-foreground); + color: var(--theia-notificationsErrorIcon-foreground); } .theia-notification-actions { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - justify-content: space-between; - margin: 0px; - padding: 0px; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + margin: 0px; + padding: 0px; } .theia-notification-actions > li { - display: inline-block; - height: 16px; - width: 16px; - cursor: pointer; - margin-left: 4px; + display: inline-block; + height: 16px; + width: 16px; + cursor: pointer; + margin-left: 4px; } .theia-notification-actions > .expand { - transform: rotate(180deg); + transform: rotate(180deg); } .theia-notification-list-item-content-bottom { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; } .theia-notification-source { - font-size: var(--theia-ui-font-size0); - font-family: var(--theia-ui-font-family); - overflow-wrap: break-word; - box-sizing: border-box; - flex-grow: 1; - padding: 4px; - display: block; - overflow: hidden; + font-size: var(--theia-ui-font-size0); + font-family: var(--theia-ui-font-family); + overflow-wrap: break-word; + box-sizing: border-box; + flex-grow: 1; + padding: 4px; + display: block; + overflow: hidden; } .theia-notification-buttons { - flex-grow: 2; - display: flex; - flex-direction: row; - justify-content: flex-end; - flex-wrap: wrap; + flex-grow: 2; + display: flex; + flex-direction: row; + justify-content: flex-end; + flex-wrap: wrap; } .theia-notification-buttons > button { - margin: 4px; - max-width: 160px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + margin: 4px; + max-width: 160px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } .theia-notification-item-progress { - display: block; + display: block; } .theia-notification-item-progressbar { - height: 2px; - background-color: var(--theia-progressBar-background); - width: 66%; + height: 2px; + background-color: var(--theia-progressBar-background); + width: 66%; } .theia-notification-item-progressbar.indeterminate { - /* `progress-animation` is defined in `packages/core/src/browser/style/progress-bar.css` */ - animation: progress-animation 1.3s 0s infinite cubic-bezier(0.645, 0.045, 0.355, 1); + /* `progress-animation` is defined in `packages/core/src/browser/style/progress-bar.css` */ + animation: progress-animation 1.3s 0s infinite + cubic-bezier(0.645, 0.045, 0.355, 1); } /* Perfect scrollbar */ .theia-notification-list-scroll-container .ps__rail-y { - width: var(--theia-scrollbar-rail-width); + width: var(--theia-scrollbar-rail-width); } .theia-notification-list-scroll-container .ps__rail-y:hover > .ps__thumb-y, .theia-notification-list-scroll-container .ps__rail-y:focus > .ps__thumb-y, -.theia-notification-list-scroll-container .ps__rail-y.ps--clicking .ps__thumb-y { - right: calc((var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2); - width: var(--theia-scrollbar-width); +.theia-notification-list-scroll-container + .ps__rail-y.ps--clicking + .ps__thumb-y { + right: calc( + (var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2 + ); + width: var(--theia-scrollbar-width); } .theia-notification-list-scroll-container .ps__rail-y > .ps__thumb-y { - width: var(--theia-scrollbar-width); - right: calc((var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2); - background: var(--theia-scrollbarSlider-background); - border-radius: 0px; + width: var(--theia-scrollbar-width); + right: calc( + (var(--theia-scrollbar-rail-width) - var(--theia-scrollbar-width)) / 2 + ); + background: var(--theia-scrollbarSlider-background); + border-radius: 0px; } diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 6c7f26d722696..10f9b89aabede 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -17,7 +17,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/metrics/src/node/extensions-metrics-contribution.ts b/packages/metrics/src/node/extensions-metrics-contribution.ts index 33dbee4a58540..32ed0e4c9d360 100644 --- a/packages/metrics/src/node/extensions-metrics-contribution.ts +++ b/packages/metrics/src/node/extensions-metrics-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; import { MetricsContribution } from './metrics-contribution'; diff --git a/packages/metrics/src/node/index.ts b/packages/metrics/src/node/index.ts index d53540a0c8e6c..362dd3e255b8d 100644 --- a/packages/metrics/src/node/index.ts +++ b/packages/metrics/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './metrics-backend-application-contribution'; diff --git a/packages/metrics/src/node/metrics-backend-application-contribution.ts b/packages/metrics/src/node/metrics-backend-application-contribution.ts index 619f7832ac345..b672e2e982bde 100644 --- a/packages/metrics/src/node/metrics-backend-application-contribution.ts +++ b/packages/metrics/src/node/metrics-backend-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/metrics/src/node/metrics-backend-module.ts b/packages/metrics/src/node/metrics-backend-module.ts index eacd78cc5fddc..9ef1dbb1997ba 100644 --- a/packages/metrics/src/node/metrics-backend-module.ts +++ b/packages/metrics/src/node/metrics-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/metrics/src/node/metrics-contribution.ts b/packages/metrics/src/node/metrics-contribution.ts index fd5c589b8dc73..7cf2b433a575a 100644 --- a/packages/metrics/src/node/metrics-contribution.ts +++ b/packages/metrics/src/node/metrics-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const MetricsContribution = Symbol('MetricsContribution'); export interface MetricsContribution { diff --git a/packages/metrics/src/node/node-metrics-contribution.ts b/packages/metrics/src/node/node-metrics-contribution.ts index 09d20583e684f..006babe78877d 100644 --- a/packages/metrics/src/node/node-metrics-contribution.ts +++ b/packages/metrics/src/node/node-metrics-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as prom from 'prom-client'; diff --git a/packages/metrics/src/node/prometheus.spec.ts b/packages/metrics/src/node/prometheus.spec.ts index f24065bd8bfa8..1bdecba5b0361 100644 --- a/packages/metrics/src/node/prometheus.spec.ts +++ b/packages/metrics/src/node/prometheus.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/metrics/src/node/prometheus.ts b/packages/metrics/src/node/prometheus.ts index ccdca38d98ac9..2ccd7e9113c25 100644 --- a/packages/metrics/src/node/prometheus.ts +++ b/packages/metrics/src/node/prometheus.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export function toPrometheusValidName(name: string): string { diff --git a/packages/mini-browser/package.json b/packages/mini-browser/package.json index 0aa7ad4f3fa88..eefc46ad3171e 100644 --- a/packages/mini-browser/package.json +++ b/packages/mini-browser/package.json @@ -27,7 +27,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/mini-browser/src/browser/environment/mini-browser-environment-module.ts b/packages/mini-browser/src/browser/environment/mini-browser-environment-module.ts index 1f2dc0076bdc7..de4db353004e6 100644 --- a/packages/mini-browser/src/browser/environment/mini-browser-environment-module.ts +++ b/packages/mini-browser/src/browser/environment/mini-browser-environment-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationContribution } from '@theia/core/lib/browser'; diff --git a/packages/mini-browser/src/browser/environment/mini-browser-environment.ts b/packages/mini-browser/src/browser/environment/mini-browser-environment.ts index 083fc469227fc..f5253f43708d6 100644 --- a/packages/mini-browser/src/browser/environment/mini-browser-environment.ts +++ b/packages/mini-browser/src/browser/environment/mini-browser-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Endpoint, FrontendApplicationContribution } from '@theia/core/lib/browser'; diff --git a/packages/mini-browser/src/browser/location-mapper-service.ts b/packages/mini-browser/src/browser/location-mapper-service.ts index eb19374691cb8..227c633c8c7f2 100644 --- a/packages/mini-browser/src/browser/location-mapper-service.ts +++ b/packages/mini-browser/src/browser/location-mapper-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/mini-browser/src/browser/mini-browser-content-style.ts b/packages/mini-browser/src/browser/mini-browser-content-style.ts index abd415c1a0768..24da59ba42148 100644 --- a/packages/mini-browser/src/browser/mini-browser-content-style.ts +++ b/packages/mini-browser/src/browser/mini-browser-content-style.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace MiniBrowserContentStyle { export const MINI_BROWSER = 'theia-mini-browser'; diff --git a/packages/mini-browser/src/browser/mini-browser-content.ts b/packages/mini-browser/src/browser/mini-browser-content.ts index 8041c55348caa..ab402e906d79a 100644 --- a/packages/mini-browser/src/browser/mini-browser-content.ts +++ b/packages/mini-browser/src/browser/mini-browser-content.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as PDFObject from 'pdfobject'; diff --git a/packages/mini-browser/src/browser/mini-browser-frontend-module.ts b/packages/mini-browser/src/browser/mini-browser-frontend-module.ts index 3a9f640fe671c..5fd900e4f90e4 100644 --- a/packages/mini-browser/src/browser/mini-browser-frontend-module.ts +++ b/packages/mini-browser/src/browser/mini-browser-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/mini-browser/src/browser/mini-browser-frontend-security-warnings.ts b/packages/mini-browser/src/browser/mini-browser-frontend-security-warnings.ts index 198a67ce5b0b6..3d54b20a7f89f 100644 --- a/packages/mini-browser/src/browser/mini-browser-frontend-security-warnings.ts +++ b/packages/mini-browser/src/browser/mini-browser-frontend-security-warnings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MessageService } from '@theia/core'; diff --git a/packages/mini-browser/src/browser/mini-browser-open-handler.ts b/packages/mini-browser/src/browser/mini-browser-open-handler.ts index bb5664416f5f1..269e15243178e 100644 --- a/packages/mini-browser/src/browser/mini-browser-open-handler.ts +++ b/packages/mini-browser/src/browser/mini-browser-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget } from '@theia/core/shared/@phosphor/widgets'; diff --git a/packages/mini-browser/src/browser/mini-browser.ts b/packages/mini-browser/src/browser/mini-browser.ts index d3660bd6b4027..9e8fc0c6cac21 100644 --- a/packages/mini-browser/src/browser/mini-browser.ts +++ b/packages/mini-browser/src/browser/mini-browser.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/mini-browser/src/browser/pdfobject.d.ts b/packages/mini-browser/src/browser/pdfobject.d.ts index 1201a33fea0d2..fbc8a1681550a 100644 --- a/packages/mini-browser/src/browser/pdfobject.d.ts +++ b/packages/mini-browser/src/browser/pdfobject.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/mini-browser/src/browser/style/index.css b/packages/mini-browser/src/browser/style/index.css index 2b38b9d7b8041..c7b09b888ddd2 100644 --- a/packages/mini-browser/src/browser/style/index.css +++ b/packages/mini-browser/src/browser/style/index.css @@ -11,145 +11,147 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-private-mini-browser-height: var(--theia-content-line-height); + --theia-private-mini-browser-height: var(--theia-content-line-height); } .theia-mini-browser { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; } .theia-mini-browser-toolbar { - margin-top: 8px; - display: flex; - align-items: center; - justify-content: space-evenly; - padding: 0 10px; + margin-top: 8px; + display: flex; + align-items: center; + justify-content: space-evenly; + padding: 0 10px; } .theia-mini-browser-toolbar-read-only { - margin-top: 8px; - display: flex; - align-items: center; - justify-content: space-evenly; - padding: 0 10px; + margin-top: 8px; + display: flex; + align-items: center; + justify-content: space-evenly; + padding: 0 10px; } .theia-mini-browser-toolbar .theia-input { - width: 100%; - line-height: var(--theia-private-mini-browser-height); - margin-left: 4px; - margin-right: 4px; + width: 100%; + line-height: var(--theia-private-mini-browser-height); + margin-left: 4px; + margin-right: 4px; } .theia-mini-browser-toolbar-read-only .theia-input { - width: 100%; - line-height: var(--theia-private-mini-browser-height); - margin-left: 4px; - margin-right: 4px; - cursor: pointer; - background: var(--theia-input-background); - border: none; - text-decoration: underline; - outline: none; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: var(--theia-input-foreground); + width: 100%; + line-height: var(--theia-private-mini-browser-height); + margin-left: 4px; + margin-right: 4px; + cursor: pointer; + background: var(--theia-input-background); + border: none; + text-decoration: underline; + outline: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: var(--theia-input-foreground); } .theia-mini-browser-toolbar-read-only .theia-input:hover { - color: var(--theia-button-hoverBackground); + color: var(--theia-button-hoverBackground); } .theia-mini-browser-button { - min-width: 1rem; - text-align: center; - flex-grow: 0; - font-family: FontAwesome; - font-size: calc(var(--theia-content-font-size) * 0.8); - color: var(--theia-icon-foreground); - margin: 0px 4px 0px 4px; + min-width: 1rem; + text-align: center; + flex-grow: 0; + font-family: FontAwesome; + font-size: calc(var(--theia-content-font-size) * 0.8); + color: var(--theia-icon-foreground); + margin: 0px 4px 0px 4px; } .theia-mini-browser-button:not(.theia-mini-browser-button-disabled):hover { - cursor: pointer; + cursor: pointer; } .theia-mini-browser-button-disabled { - opacity: var(--theia-mod-disabled-opacity); + opacity: var(--theia-mod-disabled-opacity); } .theia-mini-browser-previous::before { - content: "\f053"; + content: "\f053"; } .theia-mini-browser-next::before { - content: "\f054"; + content: "\f054"; } .theia-mini-browser-refresh::before { - content: "\f021"; + content: "\f021"; } .theia-mini-browser-open::before { - content: "\f08e"; + content: "\f08e"; } .theia-mini-browser-content-area { - position: relative; - display: flex; - height: 100%; - width: 100%; - flex-direction: column; - overflow: hidden; - margin-top: 6px; + position: relative; + display: flex; + height: 100%; + width: 100%; + flex-direction: column; + overflow: hidden; + margin-top: 6px; } .theia-mini-browser-pdf-container { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .theia-mini-browser-load-indicator { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 10; - background: var(--theia-editor-background); - background-image: var(--theia-preloader); - background-size: 60px 60px; - background-repeat: no-repeat; - background-position: center; - transition: opacity 0.8s; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 10; + background: var(--theia-editor-background); + background-image: var(--theia-preloader); + background-size: 60px 60px; + background-repeat: no-repeat; + background-position: center; + transition: opacity 0.8s; } .theia-mini-browser-load-indicator.theia-fade-out { - opacity: 0; + opacity: 0; } .theia-mini-browser-error-bar { - height: 19px; - padding-left: var(--theia-ui-padding); - background-color: var(--theia-inputValidation-errorBorder); - color: var(--theia-editor-foreground); - font-size: var(--theia-statusBar-font-size); - z-index: 1000; /* Above the transparent overlay (`z-index: 999;`). */ + height: 19px; + padding-left: var(--theia-ui-padding); + background-color: var(--theia-inputValidation-errorBorder); + color: var(--theia-editor-foreground); + font-size: var(--theia-statusBar-font-size); + z-index: 1000; /* Above the transparent overlay (`z-index: 999;`). */ } .theia-mini-browser-error-bar span { - margin-top: 3px; - margin-left: var(--theia-ui-padding); + margin-top: 3px; + margin-left: var(--theia-ui-padding); } .theia-mini-browser-content-area iframe { - flex-grow: 1; - border: none; margin: 0; padding: 0; + flex-grow: 1; + border: none; + margin: 0; + padding: 0; } diff --git a/packages/mini-browser/src/common/mini-browser-endpoint.ts b/packages/mini-browser/src/common/mini-browser-endpoint.ts index a9ffae01a35af..d877e4ceac71c 100644 --- a/packages/mini-browser/src/common/mini-browser-endpoint.ts +++ b/packages/mini-browser/src/common/mini-browser-endpoint.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/mini-browser/src/common/mini-browser-service.ts b/packages/mini-browser/src/common/mini-browser-service.ts index 795ea0ec55a19..d0494497169e8 100644 --- a/packages/mini-browser/src/common/mini-browser-service.ts +++ b/packages/mini-browser/src/common/mini-browser-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const MiniBrowserServicePath = '/services/mini-browser-service'; diff --git a/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment-module.ts b/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment-module.ts index d5f7fc111b2c9..a89a485bf0ef5 100644 --- a/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment-module.ts +++ b/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FrontendApplicationContribution } from '@theia/core/lib/browser'; diff --git a/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment.ts b/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment.ts index 580d61d36a59c..3ad4cebe6dc97 100644 --- a/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment.ts +++ b/packages/mini-browser/src/electron-browser/environment/electron-mini-browser-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Endpoint } from '@theia/core/lib/browser'; diff --git a/packages/mini-browser/src/electron-main/mini-browser-electron-main-contribution.ts b/packages/mini-browser/src/electron-main/mini-browser-electron-main-contribution.ts index d7f522d110037..550b3d6ae79ee 100644 --- a/packages/mini-browser/src/electron-main/mini-browser-electron-main-contribution.ts +++ b/packages/mini-browser/src/electron-main/mini-browser-electron-main-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ElectronMainApplication, ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application'; diff --git a/packages/mini-browser/src/node/mini-browser-backend-module.ts b/packages/mini-browser/src/node/mini-browser-backend-module.ts index bb2bf90f3a43d..53d6e1df069c4 100644 --- a/packages/mini-browser/src/node/mini-browser-backend-module.ts +++ b/packages/mini-browser/src/node/mini-browser-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/mini-browser/src/node/mini-browser-backend-security-warnings.ts b/packages/mini-browser/src/node/mini-browser-backend-security-warnings.ts index 5af013bd8f7dd..7897165732a57 100644 --- a/packages/mini-browser/src/node/mini-browser-backend-security-warnings.ts +++ b/packages/mini-browser/src/node/mini-browser-backend-security-warnings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BackendApplicationContribution } from '@theia/core/lib/node'; diff --git a/packages/mini-browser/src/node/mini-browser-endpoint.ts b/packages/mini-browser/src/node/mini-browser-endpoint.ts index 99766c363211f..f8400b862bfff 100644 --- a/packages/mini-browser/src/node/mini-browser-endpoint.ts +++ b/packages/mini-browser/src/node/mini-browser-endpoint.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const vhost = require('vhost'); diff --git a/packages/mini-browser/src/node/mini-browser-ws-validator.ts b/packages/mini-browser/src/node/mini-browser-ws-validator.ts index 298d90dd31ec3..f34774454913f 100644 --- a/packages/mini-browser/src/node/mini-browser-ws-validator.ts +++ b/packages/mini-browser/src/node/mini-browser-ws-validator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { WsRequestValidatorContribution } from '@theia/core/lib/node/ws-request-validators'; diff --git a/packages/mini-browser/src/package.spec.ts b/packages/mini-browser/src/package.spec.ts index a51564b06c353..eb3b80a366531 100644 --- a/packages/mini-browser/src/package.spec.ts +++ b/packages/mini-browser/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** describe('mini-browser package', () => { diff --git a/packages/monaco/package.json b/packages/monaco/package.json index 06238ade28d72..84e7a3ec50ee4 100644 --- a/packages/monaco/package.json +++ b/packages/monaco/package.json @@ -26,7 +26,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/monaco/src/browser/index.ts b/packages/monaco/src/browser/index.ts index f5c03feb1b47f..a23a83b194a5f 100644 --- a/packages/monaco/src/browser/index.ts +++ b/packages/monaco/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './monaco-frontend-module'; diff --git a/packages/monaco/src/browser/markdown-renderer/monaco-markdown-renderer.ts b/packages/monaco/src/browser/markdown-renderer/monaco-markdown-renderer.ts index 32d17f8985c17..5f2852d94cba6 100644 --- a/packages/monaco/src/browser/markdown-renderer/monaco-markdown-renderer.ts +++ b/packages/monaco/src/browser/markdown-renderer/monaco-markdown-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-bulk-edit-service.ts b/packages/monaco/src/browser/monaco-bulk-edit-service.ts index 31505e8fcba2d..f1d614c63bccf 100644 --- a/packages/monaco/src/browser/monaco-bulk-edit-service.ts +++ b/packages/monaco/src/browser/monaco-bulk-edit-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-color-registry.ts b/packages/monaco/src/browser/monaco-color-registry.ts index 4c48e87aebbe1..770cd4863d50e 100644 --- a/packages/monaco/src/browser/monaco-color-registry.ts +++ b/packages/monaco/src/browser/monaco-color-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-command-registry.ts b/packages/monaco/src/browser/monaco-command-registry.ts index f580494d3e53c..e9b76e454b373 100644 --- a/packages/monaco/src/browser/monaco-command-registry.ts +++ b/packages/monaco/src/browser/monaco-command-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-command-service.ts b/packages/monaco/src/browser/monaco-command-service.ts index 5481e5a742439..7334eff649435 100644 --- a/packages/monaco/src/browser/monaco-command-service.ts +++ b/packages/monaco/src/browser/monaco-command-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-command.ts b/packages/monaco/src/browser/monaco-command.ts index 63c57b57c29e1..8d22defd108f7 100644 --- a/packages/monaco/src/browser/monaco-command.ts +++ b/packages/monaco/src/browser/monaco-command.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-context-key-service.ts b/packages/monaco/src/browser/monaco-context-key-service.ts index 9296c96cc494f..6450f4240d2d1 100644 --- a/packages/monaco/src/browser/monaco-context-key-service.ts +++ b/packages/monaco/src/browser/monaco-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-context-menu.ts b/packages/monaco/src/browser/monaco-context-menu.ts index 6d62f56e0d8b7..5049414bf83b9 100644 --- a/packages/monaco/src/browser/monaco-context-menu.ts +++ b/packages/monaco/src/browser/monaco-context-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-diff-editor.ts b/packages/monaco/src/browser/monaco-diff-editor.ts index c7eddded757a2..fa001542240d4 100644 --- a/packages/monaco/src/browser/monaco-diff-editor.ts +++ b/packages/monaco/src/browser/monaco-diff-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/monaco/src/browser/monaco-diff-navigator-factory.ts b/packages/monaco/src/browser/monaco-diff-navigator-factory.ts index 254cb4d9a0e5c..906057465ed0e 100644 --- a/packages/monaco/src/browser/monaco-diff-navigator-factory.ts +++ b/packages/monaco/src/browser/monaco-diff-navigator-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-editor-model.ts b/packages/monaco/src/browser/monaco-editor-model.ts index 88a113bf372b7..f2f44cd6776b8 100644 --- a/packages/monaco/src/browser/monaco-editor-model.ts +++ b/packages/monaco/src/browser/monaco-editor-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Position, Range, TextDocumentSaveReason, TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/monaco/src/browser/monaco-editor-provider.ts b/packages/monaco/src/browser/monaco-editor-provider.ts index 7262ae64ca7f9..20bf5ff613a71 100644 --- a/packages/monaco/src/browser/monaco-editor-provider.ts +++ b/packages/monaco/src/browser/monaco-editor-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/monaco/src/browser/monaco-editor-service.ts b/packages/monaco/src/browser/monaco-editor-service.ts index 20ae0491a3360..e6cee47621571 100644 --- a/packages/monaco/src/browser/monaco-editor-service.ts +++ b/packages/monaco/src/browser/monaco-editor-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, decorate } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-editor-zone-widget.ts b/packages/monaco/src/browser/monaco-editor-zone-widget.ts index f7448caf71520..e6eed6059cc65 100644 --- a/packages/monaco/src/browser/monaco-editor-zone-widget.ts +++ b/packages/monaco/src/browser/monaco-editor-zone-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation and others. All rights reserved. diff --git a/packages/monaco/src/browser/monaco-editor.ts b/packages/monaco/src/browser/monaco-editor.ts index 96a7d0a5f53c6..3bee47b20feff 100644 --- a/packages/monaco/src/browser/monaco-editor.ts +++ b/packages/monaco/src/browser/monaco-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, unmanaged } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-formatting-conflicts.ts b/packages/monaco/src/browser/monaco-formatting-conflicts.ts index 968a6d90874ea..361db7e5350cd 100644 --- a/packages/monaco/src/browser/monaco-formatting-conflicts.ts +++ b/packages/monaco/src/browser/monaco-formatting-conflicts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-frontend-application-contribution.ts b/packages/monaco/src/browser/monaco-frontend-application-contribution.ts index e99434d883cb2..7e62ccf7157f8 100644 --- a/packages/monaco/src/browser/monaco-frontend-application-contribution.ts +++ b/packages/monaco/src/browser/monaco-frontend-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-frontend-module.ts b/packages/monaco/src/browser/monaco-frontend-module.ts index 242b08dd5fc3d..3c4b2c049a7e7 100644 --- a/packages/monaco/src/browser/monaco-frontend-module.ts +++ b/packages/monaco/src/browser/monaco-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as MonacoNls from '@theia/monaco-editor-core/esm/vs/nls'; diff --git a/packages/monaco/src/browser/monaco-gotoline-quick-access.ts b/packages/monaco/src/browser/monaco-gotoline-quick-access.ts index b789b3956f775..4b8304b1eae99 100644 --- a/packages/monaco/src/browser/monaco-gotoline-quick-access.ts +++ b/packages/monaco/src/browser/monaco-gotoline-quick-access.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input'; diff --git a/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts b/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts index 6f92877fabb1e..f945dbda7f1fa 100644 --- a/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts +++ b/packages/monaco/src/browser/monaco-gotosymbol-quick-access.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input'; diff --git a/packages/monaco/src/browser/monaco-indexed-db.ts b/packages/monaco/src/browser/monaco-indexed-db.ts index 265df6f1228dc..57e92ed08329f 100644 --- a/packages/monaco/src/browser/monaco-indexed-db.ts +++ b/packages/monaco/src/browser/monaco-indexed-db.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as idb from 'idb'; diff --git a/packages/monaco/src/browser/monaco-keybinding-contexts.ts b/packages/monaco/src/browser/monaco-keybinding-contexts.ts index 809683f7243af..752ee2cd42573 100644 --- a/packages/monaco/src/browser/monaco-keybinding-contexts.ts +++ b/packages/monaco/src/browser/monaco-keybinding-contexts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-keybinding.ts b/packages/monaco/src/browser/monaco-keybinding.ts index a0f8e620d7c92..ec7e0bcf902d1 100644 --- a/packages/monaco/src/browser/monaco-keybinding.ts +++ b/packages/monaco/src/browser/monaco-keybinding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-keycode-map.ts b/packages/monaco/src/browser/monaco-keycode-map.ts index e4abb5d7a897a..47a83e02b703d 100644 --- a/packages/monaco/src/browser/monaco-keycode-map.ts +++ b/packages/monaco/src/browser/monaco-keycode-map.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/monaco/src/browser/monaco-languages.ts b/packages/monaco/src/browser/monaco-languages.ts index 46ec65dfe9049..d533475d804e0 100644 --- a/packages/monaco/src/browser/monaco-languages.ts +++ b/packages/monaco/src/browser/monaco-languages.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SymbolInformation, WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/monaco/src/browser/monaco-marker-collection.ts b/packages/monaco/src/browser/monaco-marker-collection.ts index 87a153a8c53de..8e60a93186f46 100644 --- a/packages/monaco/src/browser/monaco-marker-collection.ts +++ b/packages/monaco/src/browser/monaco-marker-collection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/monaco/src/browser/monaco-menu.ts b/packages/monaco/src/browser/monaco-menu.ts index 5e305950c0b01..40ab614701f43 100644 --- a/packages/monaco/src/browser/monaco-menu.ts +++ b/packages/monaco/src/browser/monaco-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-mime-service.ts b/packages/monaco/src/browser/monaco-mime-service.ts index 804e941886005..fb8d3d335785a 100644 --- a/packages/monaco/src/browser/monaco-mime-service.ts +++ b/packages/monaco/src/browser/monaco-mime-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('@theia/core/shared/lodash.debounce'); diff --git a/packages/monaco/src/browser/monaco-outline-contribution.ts b/packages/monaco/src/browser/monaco-outline-contribution.ts index b73e761b14b60..5e184548c5895 100644 --- a/packages/monaco/src/browser/monaco-outline-contribution.ts +++ b/packages/monaco/src/browser/monaco-outline-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-outline-decorator.ts b/packages/monaco/src/browser/monaco-outline-decorator.ts index 14a1e15e4bc97..834032132ba80 100644 --- a/packages/monaco/src/browser/monaco-outline-decorator.ts +++ b/packages/monaco/src/browser/monaco-outline-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-quick-access-registry.ts b/packages/monaco/src/browser/monaco-quick-access-registry.ts index 62679bf83e29e..2f0355c57a1cc 100644 --- a/packages/monaco/src/browser/monaco-quick-access-registry.ts +++ b/packages/monaco/src/browser/monaco-quick-access-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { KeybindingRegistry, QuickPickItem, QuickPickSeparator } from '@theia/core/lib/browser'; diff --git a/packages/monaco/src/browser/monaco-quick-input-service.ts b/packages/monaco/src/browser/monaco-quick-input-service.ts index d6d1e7e396284..0fddf71d686c8 100644 --- a/packages/monaco/src/browser/monaco-quick-input-service.ts +++ b/packages/monaco/src/browser/monaco-quick-input-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/monaco/src/browser/monaco-resolved-keybinding.ts b/packages/monaco/src/browser/monaco-resolved-keybinding.ts index a8aff9b8e06e0..526af0b90c390 100644 --- a/packages/monaco/src/browser/monaco-resolved-keybinding.ts +++ b/packages/monaco/src/browser/monaco-resolved-keybinding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { KeyCode as MonacoKeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes'; diff --git a/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts b/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts index 7487960117bd4..6e7ed3e813f21 100644 --- a/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts +++ b/packages/monaco/src/browser/monaco-snippet-suggest-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/monaco/src/browser/monaco-status-bar-contribution.ts b/packages/monaco/src/browser/monaco-status-bar-contribution.ts index 94dcb49d197e7..4a7ba08752c5a 100644 --- a/packages/monaco/src/browser/monaco-status-bar-contribution.ts +++ b/packages/monaco/src/browser/monaco-status-bar-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-text-model-service.ts b/packages/monaco/src/browser/monaco-text-model-service.ts index 07ec11200745f..f8a7ac2cc95ec 100644 --- a/packages/monaco/src/browser/monaco-text-model-service.ts +++ b/packages/monaco/src/browser/monaco-text-model-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-theming-service.ts b/packages/monaco/src/browser/monaco-theming-service.ts index ed8b39f71112a..38dc0a9b338ef 100644 --- a/packages/monaco/src/browser/monaco-theming-service.ts +++ b/packages/monaco/src/browser/monaco-theming-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/monaco/src/browser/monaco-to-protocol-converter.ts b/packages/monaco/src/browser/monaco-to-protocol-converter.ts index 34f9d068d8062..4b054e8fb8ab5 100644 --- a/packages/monaco/src/browser/monaco-to-protocol-converter.ts +++ b/packages/monaco/src/browser/monaco-to-protocol-converter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/monaco-workspace.ts b/packages/monaco/src/browser/monaco-workspace.ts index f82bed894cf88..b832a74b89a0a 100644 --- a/packages/monaco/src/browser/monaco-workspace.ts +++ b/packages/monaco/src/browser/monaco-workspace.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable no-null/no-null */ diff --git a/packages/monaco/src/browser/protocol-to-monaco-converter.ts b/packages/monaco/src/browser/protocol-to-monaco-converter.ts index d3f3cf68bee9b..280afe2c5a2f6 100644 --- a/packages/monaco/src/browser/protocol-to-monaco-converter.ts +++ b/packages/monaco/src/browser/protocol-to-monaco-converter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/textmate/index.ts b/packages/monaco/src/browser/textmate/index.ts index 806f351b5e5ff..085ecc365bdae 100644 --- a/packages/monaco/src/browser/textmate/index.ts +++ b/packages/monaco/src/browser/textmate/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './textmate-registry'; diff --git a/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts b/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts index deda1fdccca4b..f78ca6447459a 100644 --- a/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts +++ b/packages/monaco/src/browser/textmate/monaco-textmate-frontend-bindings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/textmate/monaco-textmate-service.ts b/packages/monaco/src/browser/textmate/monaco-textmate-service.ts index 9a770a58745b7..0f0eeca3b923a 100644 --- a/packages/monaco/src/browser/textmate/monaco-textmate-service.ts +++ b/packages/monaco/src/browser/textmate/monaco-textmate-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/textmate/monaco-theme-registry.ts b/packages/monaco/src/browser/textmate/monaco-theme-registry.ts index 42769bc69dc6b..5765036fb81ea 100644 --- a/packages/monaco/src/browser/textmate/monaco-theme-registry.ts +++ b/packages/monaco/src/browser/textmate/monaco-theme-registry.ts @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/monaco/src/browser/textmate/monaco-theme-types.ts b/packages/monaco/src/browser/textmate/monaco-theme-types.ts index ce5be20f3f463..fa58d4603724e 100644 --- a/packages/monaco/src/browser/textmate/monaco-theme-types.ts +++ b/packages/monaco/src/browser/textmate/monaco-theme-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/monaco/src/browser/textmate/textmate-contribution.ts b/packages/monaco/src/browser/textmate/textmate-contribution.ts index 2fda54c9dc997..81721766e32c6 100644 --- a/packages/monaco/src/browser/textmate/textmate-contribution.ts +++ b/packages/monaco/src/browser/textmate/textmate-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TextmateRegistry } from './textmate-registry'; diff --git a/packages/monaco/src/browser/textmate/textmate-registry.ts b/packages/monaco/src/browser/textmate/textmate-registry.ts index 16f45c96f1260..26b701d8545aa 100644 --- a/packages/monaco/src/browser/textmate/textmate-registry.ts +++ b/packages/monaco/src/browser/textmate/textmate-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts b/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts index 78e0d9c3b6009..98927f6e62ed0 100644 --- a/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts +++ b/packages/monaco/src/browser/textmate/textmate-snippet-completion-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/monaco/src/browser/textmate/textmate-tokenizer.ts b/packages/monaco/src/browser/textmate/textmate-tokenizer.ts index e60ef9c2acc1f..526e71615d88d 100644 --- a/packages/monaco/src/browser/textmate/textmate-tokenizer.ts +++ b/packages/monaco/src/browser/textmate/textmate-tokenizer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { INITIAL, IGrammar, StackElement } from 'vscode-textmate'; diff --git a/packages/monaco/src/browser/workspace-symbol-command.ts b/packages/monaco/src/browser/workspace-symbol-command.ts index 745958c6e1e0b..e4e56fcc5823b 100644 --- a/packages/monaco/src/browser/workspace-symbol-command.ts +++ b/packages/monaco/src/browser/workspace-symbol-command.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/monaco/src/package.spec.ts b/packages/monaco/src/package.spec.ts index b91f901b24e99..b21d8695986b9 100644 --- a/packages/monaco/src/package.spec.ts +++ b/packages/monaco/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/navigator/package.json b/packages/navigator/package.json index 937f355bc2d87..bc8804bdfbd7f 100644 --- a/packages/navigator/package.json +++ b/packages/navigator/package.json @@ -22,7 +22,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/navigator/src/browser/abstract-navigator-tree-widget.ts b/packages/navigator/src/browser/abstract-navigator-tree-widget.ts index 87625caf4c9dc..73c5898bea0ff 100644 --- a/packages/navigator/src/browser/abstract-navigator-tree-widget.ts +++ b/packages/navigator/src/browser/abstract-navigator-tree-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/file-navigator-commands.ts b/packages/navigator/src/browser/file-navigator-commands.ts index ba87c36965b38..fa1c7c3b07edc 100644 --- a/packages/navigator/src/browser/file-navigator-commands.ts +++ b/packages/navigator/src/browser/file-navigator-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codicon, CommonCommands } from '@theia/core/lib/browser'; diff --git a/packages/navigator/src/browser/index.ts b/packages/navigator/src/browser/index.ts index 52c6323ef2561..8c6ce3563706b 100644 --- a/packages/navigator/src/browser/index.ts +++ b/packages/navigator/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './navigator-model'; diff --git a/packages/navigator/src/browser/navigator-container.ts b/packages/navigator/src/browser/navigator-container.ts index 8bfec29159f41..b0e6bfc16139f 100644 --- a/packages/navigator/src/browser/navigator-container.ts +++ b/packages/navigator/src/browser/navigator-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-context-key-service.ts b/packages/navigator/src/browser/navigator-context-key-service.ts index cb6cc98593d52..e8c7fd8b0d666 100644 --- a/packages/navigator/src/browser/navigator-context-key-service.ts +++ b/packages/navigator/src/browser/navigator-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-contribution.ts b/packages/navigator/src/browser/navigator-contribution.ts index 0e955c302165c..884a2a64a953b 100644 --- a/packages/navigator/src/browser/navigator-contribution.ts +++ b/packages/navigator/src/browser/navigator-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-decorator-service.ts b/packages/navigator/src/browser/navigator-decorator-service.ts index 80b12620a7291..24f539f491dfb 100644 --- a/packages/navigator/src/browser/navigator-decorator-service.ts +++ b/packages/navigator/src/browser/navigator-decorator-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-diff.spec.ts b/packages/navigator/src/browser/navigator-diff.spec.ts index 6d4b6a867e79a..ced5d792c6678 100644 --- a/packages/navigator/src/browser/navigator-diff.spec.ts +++ b/packages/navigator/src/browser/navigator-diff.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/navigator/src/browser/navigator-diff.ts b/packages/navigator/src/browser/navigator-diff.ts index edef7f07cd877..762e8f02dd4fc 100644 --- a/packages/navigator/src/browser/navigator-diff.ts +++ b/packages/navigator/src/browser/navigator-diff.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-filter.spec.ts b/packages/navigator/src/browser/navigator-filter.spec.ts index 015138c57ff90..1d6002f7d027c 100644 --- a/packages/navigator/src/browser/navigator-filter.spec.ts +++ b/packages/navigator/src/browser/navigator-filter.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/navigator/src/browser/navigator-filter.ts b/packages/navigator/src/browser/navigator-filter.ts index 8d301a5b9d242..0f56b240c2dc8 100644 --- a/packages/navigator/src/browser/navigator-filter.ts +++ b/packages/navigator/src/browser/navigator-filter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-frontend-module.ts b/packages/navigator/src/browser/navigator-frontend-module.ts index aa8bc6a01b422..7958560d17515 100644 --- a/packages/navigator/src/browser/navigator-frontend-module.ts +++ b/packages/navigator/src/browser/navigator-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/navigator/src/browser/navigator-keybinding-context.ts b/packages/navigator/src/browser/navigator-keybinding-context.ts index ad90c83a3dd6e..ffd39c1924fb4 100644 --- a/packages/navigator/src/browser/navigator-keybinding-context.ts +++ b/packages/navigator/src/browser/navigator-keybinding-context.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-layout-migrations.ts b/packages/navigator/src/browser/navigator-layout-migrations.ts index a7395c044c343..de9a5067b3289 100644 --- a/packages/navigator/src/browser/navigator-layout-migrations.ts +++ b/packages/navigator/src/browser/navigator-layout-migrations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-model.ts b/packages/navigator/src/browser/navigator-model.ts index d46a410164ac0..39b6b15c2acd9 100644 --- a/packages/navigator/src/browser/navigator-model.ts +++ b/packages/navigator/src/browser/navigator-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-preferences.ts b/packages/navigator/src/browser/navigator-preferences.ts index 07a19a3fb8a5f..a9067e9caa5be 100644 --- a/packages/navigator/src/browser/navigator-preferences.ts +++ b/packages/navigator/src/browser/navigator-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-symlink-decorator.ts b/packages/navigator/src/browser/navigator-symlink-decorator.ts index a361b38b7d077..57777240707d4 100644 --- a/packages/navigator/src/browser/navigator-symlink-decorator.ts +++ b/packages/navigator/src/browser/navigator-symlink-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-tab-bar-decorator.ts b/packages/navigator/src/browser/navigator-tab-bar-decorator.ts index 75192e646ce6b..4da2297f2062a 100644 --- a/packages/navigator/src/browser/navigator-tab-bar-decorator.ts +++ b/packages/navigator/src/browser/navigator-tab-bar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-tree.ts b/packages/navigator/src/browser/navigator-tree.ts index 44ee4469e0a7c..67339b0dfe60d 100644 --- a/packages/navigator/src/browser/navigator-tree.ts +++ b/packages/navigator/src/browser/navigator-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-widget-factory.ts b/packages/navigator/src/browser/navigator-widget-factory.ts index 5ca511b9423e3..76477ebcbcbde 100644 --- a/packages/navigator/src/browser/navigator-widget-factory.ts +++ b/packages/navigator/src/browser/navigator-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/navigator-widget.tsx b/packages/navigator/src/browser/navigator-widget.tsx index eec62679f8d16..a14e532956944 100644 --- a/packages/navigator/src/browser/navigator-widget.tsx +++ b/packages/navigator/src/browser/navigator-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts b/packages/navigator/src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts index 3654f0ca86ea4..27c2a17e77e15 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts +++ b/packages/navigator/src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-commands.ts b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-commands.ts index c9dd5e1daa62f..21070e4ff7a64 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-commands.ts +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommonCommands } from '@theia/core/lib/browser'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-decorator-service.ts b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-decorator-service.ts index f401b7a059d72..e86fbebf6e978 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-decorator-service.ts +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-decorator-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-menus.ts b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-menus.ts index f31db790e80b1..4c04cf029d909 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-menus.ts +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-menus.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MenuPath } from '@theia/core/lib/common'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-tree-model.ts b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-tree-model.ts index d8841ae602a3f..d5a1b9f686d05 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-tree-model.ts +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx index 2b4e26b1ac8df..fa71057bb0e33 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/navigator/src/browser/open-editors-widget/open-editors.css b/packages/navigator/src/browser/open-editors-widget/open-editors.css index cfdd8ad2fb108..6473fa682af77 100644 --- a/packages/navigator/src/browser/open-editors-widget/open-editors.css +++ b/packages/navigator/src/browser/open-editors-widget/open-editors.css @@ -11,75 +11,94 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-open-editors-icon-width: 20px; + --theia-open-editors-icon-width: 20px; } .theia-open-editors-widget .theia-caption-suffix { - margin-left: var(--theia-ui-padding); - font-size: var(--theia-ui-font-size0); + margin-left: var(--theia-ui-padding); + font-size: var(--theia-ui-font-size0); } -.theia-open-editors-widget .open-editors-node-row .open-editors-prefix-icon-container { - min-width: var(--theia-open-editors-icon-width); +.theia-open-editors-widget + .open-editors-node-row + .open-editors-prefix-icon-container { + min-width: var(--theia-open-editors-icon-width); } -.theia-open-editors-widget .open-editors-node-row .open-editors-prefix-icon.dirty, -.theia-open-editors-widget .open-editors-node-row.dirty:hover .open-editors-prefix-icon.dirty { - display: none; +.theia-open-editors-widget + .open-editors-node-row + .open-editors-prefix-icon.dirty, +.theia-open-editors-widget + .open-editors-node-row.dirty:hover + .open-editors-prefix-icon.dirty { + display: none; } -.theia-open-editors-widget .open-editors-node-row.dirty .open-editors-prefix-icon.dirty { - display: block; +.theia-open-editors-widget + .open-editors-node-row.dirty + .open-editors-prefix-icon.dirty { + display: block; } -.theia-open-editors-widget .open-editors-node-row .open-editors-prefix-icon.close { - display: none; +.theia-open-editors-widget + .open-editors-node-row + .open-editors-prefix-icon.close { + display: none; } -.theia-open-editors-widget .open-editors-node-row:not(.dirty) .theia-mod-selected .open-editors-prefix-icon.close, -.theia-open-editors-widget .open-editors-node-row:hover .open-editors-prefix-icon.close { - display: block; +.theia-open-editors-widget + .open-editors-node-row:not(.dirty) + .theia-mod-selected + .open-editors-prefix-icon.close, +.theia-open-editors-widget + .open-editors-node-row:hover + .open-editors-prefix-icon.close { + display: block; } .theia-open-editors-widget .open-editors-node-row.group-node, .theia-open-editors-widget .open-editors-node-row.area-node { - font-weight: 700; - text-transform: uppercase; - font-size: var(--theia-ui-font-size0); + font-weight: 700; + text-transform: uppercase; + font-size: var(--theia-ui-font-size0); } .theia-open-editors-widget .open-editors-node-row.area-node { - font-style: italic; + font-style: italic; } .theia-open-editors-widget .open-editors-inline-actions-container { - display: flex; - justify-content: flex-end; - margin-left: 3px; - min-height: 16px; + display: flex; + justify-content: flex-end; + margin-left: 3px; + min-height: 16px; } .theia-open-editors-widget .open-editors-inline-action a { - color: var(--theia-icon-foreground); + color: var(--theia-icon-foreground); } .theia-open-editors-widget .open-editors-inline-action { - padding: 0px 3px; - font-size: var(--theia-ui-font-size1); - margin: 0 2px; - cursor: pointer; - display: flex; - align-items: center; + padding: 0px 3px; + font-size: var(--theia-ui-font-size1); + margin: 0 2px; + cursor: pointer; + display: flex; + align-items: center; } -.theia-open-editors-widget .open-editors-node-row .open-editors-inline-actions-container { - visibility: hidden; +.theia-open-editors-widget + .open-editors-node-row + .open-editors-inline-actions-container { + visibility: hidden; } -.theia-open-editors-widget .open-editors-node-row:hover .open-editors-inline-actions-container { - visibility: visible; +.theia-open-editors-widget + .open-editors-node-row:hover + .open-editors-inline-actions-container { + visibility: visible; } diff --git a/packages/navigator/src/browser/style/index.css b/packages/navigator/src/browser/style/index.css index 6d6538c889ed2..f298d89fe663a 100644 --- a/packages/navigator/src/browser/style/index.css +++ b/packages/navigator/src/browser/style/index.css @@ -11,33 +11,33 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-Files { - height: 100%; + height: 100%; } .theia-navigator-container { - font-size: var(--theia-ui-font-size1); - padding: 5px; - position: relative; + font-size: var(--theia-ui-font-size1); + padding: 5px; + position: relative; } .theia-navigator-container .open-workspace-button-container { - margin: auto; - margin-top: 5px; - display: flex; - justify-content: center; - align-self: center; + margin: auto; + margin-top: 5px; + display: flex; + justify-content: center; + align-self: center; } .theia-navigator-container .center { - text-align: center; + text-align: center; } .p-Widget .open-workspace-button { - padding: 4px 12px; - width: calc(100% - var(--theia-ui-padding)*4); - margin-left: 0; + padding: 4px 12px; + width: calc(100% - var(--theia-ui-padding) * 4); + margin-left: 0; } diff --git a/packages/navigator/src/electron-browser/electron-navigator-menu-contribution.ts b/packages/navigator/src/electron-browser/electron-navigator-menu-contribution.ts index 20daeae66c231..6e12555784473 100644 --- a/packages/navigator/src/electron-browser/electron-navigator-menu-contribution.ts +++ b/packages/navigator/src/electron-browser/electron-navigator-menu-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry, SelectionService } from '@theia/core'; diff --git a/packages/navigator/src/electron-browser/electron-navigator-module.ts b/packages/navigator/src/electron-browser/electron-navigator-module.ts index 347e278527ce1..b1385f73f1b65 100644 --- a/packages/navigator/src/electron-browser/electron-navigator-module.ts +++ b/packages/navigator/src/electron-browser/electron-navigator-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandContribution, MenuContribution } from '@theia/core'; diff --git a/packages/navigator/src/package.spec.ts b/packages/navigator/src/package.spec.ts index 9d23027e6de09..af974d76e5982 100644 --- a/packages/navigator/src/package.spec.ts +++ b/packages/navigator/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/outline-view/package.json b/packages/outline-view/package.json index 03302571beaaf..3ce7bc9dc921d 100644 --- a/packages/outline-view/package.json +++ b/packages/outline-view/package.json @@ -16,7 +16,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/outline-view/src/browser/index.ts b/packages/outline-view/src/browser/index.ts index 516323d6092ed..9b2189c65a026 100644 --- a/packages/outline-view/src/browser/index.ts +++ b/packages/outline-view/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './outline-view-widget'; diff --git a/packages/outline-view/src/browser/outline-breadcrumbs-contribution.tsx b/packages/outline-view/src/browser/outline-breadcrumbs-contribution.tsx index 424a8b2d6d2f5..285d76cc928c3 100644 --- a/packages/outline-view/src/browser/outline-breadcrumbs-contribution.tsx +++ b/packages/outline-view/src/browser/outline-breadcrumbs-contribution.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-decorator-service.ts b/packages/outline-view/src/browser/outline-decorator-service.ts index c5059b4ebb17c..45ace43b4f7ff 100644 --- a/packages/outline-view/src/browser/outline-decorator-service.ts +++ b/packages/outline-view/src/browser/outline-decorator-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-view-contribution.ts b/packages/outline-view/src/browser/outline-view-contribution.ts index 9113feb2d5be1..8d8577ba6faeb 100644 --- a/packages/outline-view/src/browser/outline-view-contribution.ts +++ b/packages/outline-view/src/browser/outline-view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-view-frontend-module.ts b/packages/outline-view/src/browser/outline-view-frontend-module.ts index a19910f305b45..d50c68aca5b72 100644 --- a/packages/outline-view/src/browser/outline-view-frontend-module.ts +++ b/packages/outline-view/src/browser/outline-view-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-view-service.ts b/packages/outline-view/src/browser/outline-view-service.ts index f4f0f3ebf5788..278813371f661 100644 --- a/packages/outline-view/src/browser/outline-view-service.ts +++ b/packages/outline-view/src/browser/outline-view-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-view-tree-model.ts b/packages/outline-view/src/browser/outline-view-tree-model.ts index 829245df5ef31..1fbd23a5b1277 100644 --- a/packages/outline-view/src/browser/outline-view-tree-model.ts +++ b/packages/outline-view/src/browser/outline-view-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/outline-view-widget.tsx b/packages/outline-view/src/browser/outline-view-widget.tsx index 93316781dac7a..8e9d2c4820c52 100644 --- a/packages/outline-view/src/browser/outline-view-widget.tsx +++ b/packages/outline-view/src/browser/outline-view-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/outline-view/src/browser/styles/index.css b/packages/outline-view/src/browser/styles/index.css index 9a0acc403a121..dcd6d00245411 100644 --- a/packages/outline-view/src/browser/styles/index.css +++ b/packages/outline-view/src/browser/styles/index.css @@ -11,14 +11,14 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .no-outline { - color: var(--theia-foreground); - text-align: left; + color: var(--theia-foreground); + text-align: left; } .theia-side-panel .no-outline { - margin-left: 9px; + margin-left: 9px; } diff --git a/packages/outline-view/src/package.spec.ts b/packages/outline-view/src/package.spec.ts index 77d72b41f6349..c7aa273a56feb 100644 --- a/packages/outline-view/src/package.spec.ts +++ b/packages/outline-view/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/output/package.json b/packages/output/package.json index bf49e87cde322..3c8f032b237c6 100644 --- a/packages/output/package.json +++ b/packages/output/package.json @@ -21,7 +21,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/output/src/browser/output-channel.ts b/packages/output/src/browser/output-channel.ts index dab1c26435015..2097d8c860cb1 100644 --- a/packages/output/src/browser/output-channel.ts +++ b/packages/output/src/browser/output-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as PQueue from 'p-queue'; diff --git a/packages/output/src/browser/output-commands.ts b/packages/output/src/browser/output-commands.ts index 4350c0cf5a825..2926b2deeb307 100644 --- a/packages/output/src/browser/output-commands.ts +++ b/packages/output/src/browser/output-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codicon } from '@theia/core/lib/browser'; diff --git a/packages/output/src/browser/output-context-menu.ts b/packages/output/src/browser/output-context-menu.ts index bf3168dc9ed29..46b4439af3811 100644 --- a/packages/output/src/browser/output-context-menu.ts +++ b/packages/output/src/browser/output-context-menu.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; import { MenuPath } from '@theia/core/lib/common'; diff --git a/packages/output/src/browser/output-contribution.ts b/packages/output/src/browser/output-contribution.ts index 6f3a14b8e00f0..2dc1a3846ea2f 100644 --- a/packages/output/src/browser/output-contribution.ts +++ b/packages/output/src/browser/output-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/output/src/browser/output-editor-factory.ts b/packages/output/src/browser/output-editor-factory.ts index 8d57e43473515..4c1706ec68e81 100644 --- a/packages/output/src/browser/output-editor-factory.ts +++ b/packages/output/src/browser/output-editor-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/output/src/browser/output-editor-model-factory.ts b/packages/output/src/browser/output-editor-model-factory.ts index 4c33396b45f8c..694021bd755ca 100644 --- a/packages/output/src/browser/output-editor-model-factory.ts +++ b/packages/output/src/browser/output-editor-model-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/output/src/browser/output-frontend-module.ts b/packages/output/src/browser/output-frontend-module.ts index 5c4881caee4d6..938c997e3f367 100644 --- a/packages/output/src/browser/output-frontend-module.ts +++ b/packages/output/src/browser/output-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/output/src/browser/output-preferences.ts b/packages/output/src/browser/output-preferences.ts index 44a6b129a4f91..af88fb5d45626 100644 --- a/packages/output/src/browser/output-preferences.ts +++ b/packages/output/src/browser/output-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/output/src/browser/output-resource.ts b/packages/output/src/browser/output-resource.ts index 3e422467fd2b3..014525ad80bad 100644 --- a/packages/output/src/browser/output-resource.ts +++ b/packages/output/src/browser/output-resource.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/output/src/browser/output-toolbar-contribution.tsx b/packages/output/src/browser/output-toolbar-contribution.tsx index 7ad3f975b6c42..de14472373d82 100644 --- a/packages/output/src/browser/output-toolbar-contribution.tsx +++ b/packages/output/src/browser/output-toolbar-contribution.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/output/src/browser/output-widget.ts b/packages/output/src/browser/output-widget.ts index 3a14f66f0b43a..21a5762bd7008 100644 --- a/packages/output/src/browser/output-widget.ts +++ b/packages/output/src/browser/output-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/output.css'; diff --git a/packages/output/src/browser/style/output.css b/packages/output/src/browser/style/output.css index f31ae1f84a1c9..4448df60b766e 100644 --- a/packages/output/src/browser/style/output.css +++ b/packages/output/src/browser/style/output.css @@ -11,21 +11,21 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-output .editor-container { - height: 100%; + height: 100%; } .theia-output .theia-output-error { - color: var(--theia-errorForeground); + color: var(--theia-errorForeground); } .theia-output .theia-output-warning { - color: var(--theia-editorWarning-foreground); + color: var(--theia-editorWarning-foreground); } #outputChannelList .theia-select-component { - width: 170px; + width: 170px; } diff --git a/packages/output/src/common/output-uri.spec.ts b/packages/output/src/common/output-uri.spec.ts index 01fa4b6d7bedd..3cf3454fff199 100644 --- a/packages/output/src/common/output-uri.spec.ts +++ b/packages/output/src/common/output-uri.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/output/src/common/output-uri.ts b/packages/output/src/common/output-uri.ts index 0fb22d83acaf1..0b70287cf37fb 100644 --- a/packages/output/src/common/output-uri.ts +++ b/packages/output/src/common/output-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/plugin-dev/package.json b/packages/plugin-dev/package.json index dc5f2ec985a50..e1109ab69a0c7 100644 --- a/packages/plugin-dev/package.json +++ b/packages/plugin-dev/package.json @@ -26,7 +26,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/plugin-dev/src/browser/hosted-plugin-controller.ts b/packages/plugin-dev/src/browser/hosted-plugin-controller.ts index e2b91d95e4a90..e9dcca59e9be9 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-controller.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-controller.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/hosted-plugin-frontend-contribution.ts b/packages/plugin-dev/src/browser/hosted-plugin-frontend-contribution.ts index 513b1d62c7221..dc2c84ccfa320 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-frontend-contribution.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/hosted-plugin-informer.ts b/packages/plugin-dev/src/browser/hosted-plugin-informer.ts index 138aabd63e3c6..5bcdae19db981 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-informer.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-informer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts b/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts index d3794124cbd6b..363588f4d7b36 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/hosted-plugin-manager-client.ts b/packages/plugin-dev/src/browser/hosted-plugin-manager-client.ts index 943fcc219d325..fb727aa104941 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-manager-client.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-manager-client.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/hosted-plugin-preferences.ts b/packages/plugin-dev/src/browser/hosted-plugin-preferences.ts index da1d062500e70..7143bf40bbc61 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-preferences.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/browser/plugin-dev-frontend-module.ts b/packages/plugin-dev/src/browser/plugin-dev-frontend-module.ts index d6a8695ad680e..00fc2ed768722 100644 --- a/packages/plugin-dev/src/browser/plugin-dev-frontend-module.ts +++ b/packages/plugin-dev/src/browser/plugin-dev-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { HostedPluginLogViewer } from './hosted-plugin-log-viewer'; diff --git a/packages/plugin-dev/src/common/index.ts b/packages/plugin-dev/src/common/index.ts index cebf2299e306d..ed89d14d62949 100644 --- a/packages/plugin-dev/src/common/index.ts +++ b/packages/plugin-dev/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Exports contribution point for uri postprocessor of hosted plugin manager. diff --git a/packages/plugin-dev/src/common/plugin-dev-protocol.ts b/packages/plugin-dev/src/common/plugin-dev-protocol.ts index dc69da104e5fa..1b04ebbb8513e 100644 --- a/packages/plugin-dev/src/common/plugin-dev-protocol.ts +++ b/packages/plugin-dev/src/common/plugin-dev-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory'; diff --git a/packages/plugin-dev/src/node-electron/plugin-dev-electron-backend-module.ts b/packages/plugin-dev/src/node-electron/plugin-dev-electron-backend-module.ts index 0e2b3e111b1b6..da2a9c287b0b1 100644 --- a/packages/plugin-dev/src/node-electron/plugin-dev-electron-backend-module.ts +++ b/packages/plugin-dev/src/node-electron/plugin-dev-electron-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { HostedInstanceManager, ElectronNodeHostedPluginRunner } from '../node/hosted-instance-manager'; diff --git a/packages/plugin-dev/src/node/hosted-instance-manager.ts b/packages/plugin-dev/src/node/hosted-instance-manager.ts index 415a96d5cb85a..a0f45a66cb02c 100644 --- a/packages/plugin-dev/src/node/hosted-instance-manager.ts +++ b/packages/plugin-dev/src/node/hosted-instance-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { RequestOptions, RequestService } from '@theia/core/shared/@theia/request'; diff --git a/packages/plugin-dev/src/node/hosted-plugin-reader.ts b/packages/plugin-dev/src/node/hosted-plugin-reader.ts index 202d85872a662..7aeec23cdeb74 100644 --- a/packages/plugin-dev/src/node/hosted-plugin-reader.ts +++ b/packages/plugin-dev/src/node/hosted-plugin-reader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/node/hosted-plugin-uri-postprocessor.ts b/packages/plugin-dev/src/node/hosted-plugin-uri-postprocessor.ts index 80716dc79f6ae..6521bfe80a997 100644 --- a/packages/plugin-dev/src/node/hosted-plugin-uri-postprocessor.ts +++ b/packages/plugin-dev/src/node/hosted-plugin-uri-postprocessor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/plugin-dev/src/node/hosted-plugins-manager.ts b/packages/plugin-dev/src/node/hosted-plugins-manager.ts index fe726a3db8e7f..db9d3dede9e08 100644 --- a/packages/plugin-dev/src/node/hosted-plugins-manager.ts +++ b/packages/plugin-dev/src/node/hosted-plugins-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-dev/src/node/plugin-dev-backend-module.ts b/packages/plugin-dev/src/node/plugin-dev-backend-module.ts index 2930aba6e170a..a835e178d0cf4 100644 --- a/packages/plugin-dev/src/node/plugin-dev-backend-module.ts +++ b/packages/plugin-dev/src/node/plugin-dev-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { HostedInstanceManager, NodeHostedPluginRunner } from './hosted-instance-manager'; diff --git a/packages/plugin-dev/src/node/plugin-dev-service.ts b/packages/plugin-dev/src/node/plugin-dev-service.ts index 58c0ecf566523..e3bac4890005d 100644 --- a/packages/plugin-dev/src/node/plugin-dev-service.ts +++ b/packages/plugin-dev/src/node/plugin-dev-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDebugConfiguration, PluginDevServer, PluginDevClient } from '../common/plugin-dev-protocol'; diff --git a/packages/plugin-dev/src/package.spec.ts b/packages/plugin-dev/src/package.spec.ts index bc71f05d4f7b8..509a893159f23 100644 --- a/packages/plugin-dev/src/package.spec.ts +++ b/packages/plugin-dev/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/plugin-ext-vscode/package.json b/packages/plugin-ext-vscode/package.json index d7ae32c5afda0..4e42caff7bca5 100644 --- a/packages/plugin-ext-vscode/package.json +++ b/packages/plugin-ext-vscode/package.json @@ -30,7 +30,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts index a385a09fd1d30..30d1c45cf5a9b 100755 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, CommandContribution, CommandRegistry, environment, isOSX, CancellationTokenSource, MessageService } from '@theia/core'; diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-contribution.ts index 064f705e0839e..6543ad55a7d35 100644 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-contribution.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-frontend-module.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-frontend-module.ts index 3c398b252e715..a6dbb21d879c4 100644 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-frontend-module.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/common/plugin-vscode-environment.ts b/packages/plugin-ext-vscode/src/common/plugin-vscode-environment.ts index 03751d42251dd..16601eac78174 100644 --- a/packages/plugin-ext-vscode/src/common/plugin-vscode-environment.ts +++ b/packages/plugin-ext-vscode/src/common/plugin-vscode-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/common/plugin-vscode-types.ts b/packages/plugin-ext-vscode/src/common/plugin-vscode-types.ts index 0bed4c5da9d2e..9715297e88d30 100644 --- a/packages/plugin-ext-vscode/src/common/plugin-vscode-types.ts +++ b/packages/plugin-ext-vscode/src/common/plugin-vscode-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DEFAULT_SUPPORTED_API_VERSION } from '@theia/core/shared/@theia/application-package/lib/api'; diff --git a/packages/plugin-ext-vscode/src/common/plugin-vscode-uri.ts b/packages/plugin-ext-vscode/src/common/plugin-vscode-uri.ts index 1ab790576024d..116dc80cc0858 100644 --- a/packages/plugin-ext-vscode/src/common/plugin-vscode-uri.ts +++ b/packages/plugin-ext-vscode/src/common/plugin-vscode-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/plugin-ext-vscode/src/node/context/plugin-vscode-init-fe.ts b/packages/plugin-ext-vscode/src/node/context/plugin-vscode-init-fe.ts index dc0f1975efe96..143984dd9d54c 100644 --- a/packages/plugin-ext-vscode/src/node/context/plugin-vscode-init-fe.ts +++ b/packages/plugin-ext-vscode/src/node/context/plugin-vscode-init-fe.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/packages/plugin-ext-vscode/src/node/local-vsix-file-plugin-deployer-resolver.ts b/packages/plugin-ext-vscode/src/node/local-vsix-file-plugin-deployer-resolver.ts index 398f412065ebc..a151ea26395bf 100644 --- a/packages/plugin-ext-vscode/src/node/local-vsix-file-plugin-deployer-resolver.ts +++ b/packages/plugin-ext-vscode/src/node/local-vsix-file-plugin-deployer-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/plugin-ext-vscode/src/node/package.spec.ts b/packages/plugin-ext-vscode/src/node/package.spec.ts index 8253f0d6b81dd..d822d1a80c612 100644 --- a/packages/plugin-ext-vscode/src/node/package.spec.ts +++ b/packages/plugin-ext-vscode/src/node/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/plugin-ext-vscode/src/node/plugin-reader.ts b/packages/plugin-ext-vscode/src/node/plugin-reader.ts index 9e1711dfa3d36..babe54b58e12d 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-reader.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-reader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts index 180781526b768..c1230e33aeda8 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts index b85f94e976a41..69f5244858b27 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-cli-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-deployer-participant.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-deployer-participant.ts index 57225a3c4932c..5508feda6d79f 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-deployer-participant.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-deployer-participant.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-directory-handler.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-directory-handler.ts index d3e45f86648c7..3dfd2c1230143 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-directory-handler.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-directory-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-file-handler.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-file-handler.ts index 8c092ffebe95d..1786958a9373e 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-file-handler.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-file-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext, PluginType } from '@theia/plugin-ext'; diff --git a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts index 91b72ecdb2f12..244ecbd2e432f 100644 --- a/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts +++ b/packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext-vscode/src/node/scanner-vscode.ts b/packages/plugin-ext-vscode/src/node/scanner-vscode.ts index 10ba04aebe9fa..7b1049eea1e5d 100644 --- a/packages/plugin-ext-vscode/src/node/scanner-vscode.ts +++ b/packages/plugin-ext-vscode/src/node/scanner-vscode.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/package.json b/packages/plugin-ext/package.json index 70ce667166d8b..13835038b7501 100644 --- a/packages/plugin-ext/package.json +++ b/packages/plugin-ext/package.json @@ -63,7 +63,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/plugin-ext/src/common/arrays.ts b/packages/plugin-ext/src/common/arrays.ts index 28872ee204272..67dca52d4a207 100644 --- a/packages/plugin-ext/src/common/arrays.ts +++ b/packages/plugin-ext/src/common/arrays.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/assert.ts b/packages/plugin-ext/src/common/assert.ts index 367661ca0a667..4fe96119e8cc9 100644 --- a/packages/plugin-ext/src/common/assert.ts +++ b/packages/plugin-ext/src/common/assert.ts @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/packages/plugin-ext/src/common/cache.ts b/packages/plugin-ext/src/common/cache.ts index 818302d38b53c..0014ae8441ccf 100644 --- a/packages/plugin-ext/src/common/cache.ts +++ b/packages/plugin-ext/src/common/cache.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/api/common/cache.ts diff --git a/packages/plugin-ext/src/common/character-classifier.ts b/packages/plugin-ext/src/common/character-classifier.ts index 4be01e77ed24b..1a2c6a5be914b 100644 --- a/packages/plugin-ext/src/common/character-classifier.ts +++ b/packages/plugin-ext/src/common/character-classifier.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/collections.ts b/packages/plugin-ext/src/common/collections.ts index 1e2576a3f7582..96a90b74dda62 100644 --- a/packages/plugin-ext/src/common/collections.ts +++ b/packages/plugin-ext/src/common/collections.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/common/connection.ts b/packages/plugin-ext/src/common/connection.ts index 9c4c7640095f8..6a78228e78e58 100644 --- a/packages/plugin-ext/src/common/connection.ts +++ b/packages/plugin-ext/src/common/connection.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebugChannel } from '@theia/debug/lib/common/debug-service'; import { ConnectionExt, ConnectionMain } from './plugin-api-rpc'; diff --git a/packages/plugin-ext/src/common/disposable-util.ts b/packages/plugin-ext/src/common/disposable-util.ts index 208b1df18437c..5042f0fa2fe8b 100644 --- a/packages/plugin-ext/src/common/disposable-util.ts +++ b/packages/plugin-ext/src/common/disposable-util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface Disposable { diff --git a/packages/plugin-ext/src/common/editor-options.ts b/packages/plugin-ext/src/common/editor-options.ts index 7cf4b38c3cdc3..2f989a138c77b 100644 --- a/packages/plugin-ext/src/common/editor-options.ts +++ b/packages/plugin-ext/src/common/editor-options.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/common/env.ts b/packages/plugin-ext/src/common/env.ts index 820e6d306f2b5..8aee82b747832 100644 --- a/packages/plugin-ext/src/common/env.ts +++ b/packages/plugin-ext/src/common/env.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface QueryParameters { diff --git a/packages/plugin-ext/src/common/errors.ts b/packages/plugin-ext/src/common/errors.ts index bd67041040a24..37b3a31560147 100644 --- a/packages/plugin-ext/src/common/errors.ts +++ b/packages/plugin-ext/src/common/errors.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export function illegalArgument(message?: string): Error { diff --git a/packages/plugin-ext/src/common/id-generator.ts b/packages/plugin-ext/src/common/id-generator.ts index e4be2c5ed945d..3a4282e9af7fe 100644 --- a/packages/plugin-ext/src/common/id-generator.ts +++ b/packages/plugin-ext/src/common/id-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export class IdGenerator { diff --git a/packages/plugin-ext/src/common/index.ts b/packages/plugin-ext/src/common/index.ts index d39f1fc134210..384be1422d1ab 100644 --- a/packages/plugin-ext/src/common/index.ts +++ b/packages/plugin-ext/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Here we expose types from @theia/plugin, so it becomes a direct dependency diff --git a/packages/plugin-ext/src/common/language-pack-service.ts b/packages/plugin-ext/src/common/language-pack-service.ts index cc5d72c99ed73..243a418be433b 100644 --- a/packages/plugin-ext/src/common/language-pack-service.ts +++ b/packages/plugin-ext/src/common/language-pack-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/plugin-ext/src/common/link-computer.ts b/packages/plugin-ext/src/common/link-computer.ts index c3687d0cf5689..578e6bb88a6e2 100644 --- a/packages/plugin-ext/src/common/link-computer.ts +++ b/packages/plugin-ext/src/common/link-computer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/object-identifier.ts b/packages/plugin-ext/src/common/object-identifier.ts index 811259cb58f66..724612d8a177a 100644 --- a/packages/plugin-ext/src/common/object-identifier.ts +++ b/packages/plugin-ext/src/common/object-identifier.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface ObjectIdentifier { diff --git a/packages/plugin-ext/src/common/paths-util.ts b/packages/plugin-ext/src/common/paths-util.ts index 0f67353e3d3de..aef28675d6ee1 100644 --- a/packages/plugin-ext/src/common/paths-util.ts +++ b/packages/plugin-ext/src/common/paths-util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // file copied from https://github.com/wjordan/browser-path/blob/master/src/node_path.ts diff --git a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts index 8cc517624fbd9..60d3db9fdc23f 100644 --- a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts +++ b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts index 9555c23c01da1..206e27e4b6dcf 100644 --- a/packages/plugin-ext/src/common/plugin-api-rpc.ts +++ b/packages/plugin-ext/src/common/plugin-api-rpc.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/common/plugin-ext-api-contribution.ts b/packages/plugin-ext/src/common/plugin-ext-api-contribution.ts index 73ae378f0e558..41455e26e98b3 100644 --- a/packages/plugin-ext/src/common/plugin-ext-api-contribution.ts +++ b/packages/plugin-ext/src/common/plugin-ext-api-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { RPCProtocol } from './rpc-protocol'; import { PluginManager, Plugin } from './plugin-api-rpc'; diff --git a/packages/plugin-ext/src/common/plugin-identifiers.ts b/packages/plugin-ext/src/common/plugin-identifiers.ts index 9864832495081..748d5afd31111 100644 --- a/packages/plugin-ext/src/common/plugin-identifiers.ts +++ b/packages/plugin-ext/src/common/plugin-identifiers.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace PluginIdentifiers { diff --git a/packages/plugin-ext/src/common/plugin-protocol.ts b/packages/plugin-ext/src/common/plugin-protocol.ts index 12d873c1e5079..eac6bc3897303 100644 --- a/packages/plugin-ext/src/common/plugin-protocol.ts +++ b/packages/plugin-ext/src/common/plugin-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory'; import { RPCProtocol } from './rpc-protocol'; diff --git a/packages/plugin-ext/src/common/proxy-handler.ts b/packages/plugin-ext/src/common/proxy-handler.ts index deb5ebfa62c0e..75beca868c6ec 100644 --- a/packages/plugin-ext/src/common/proxy-handler.ts +++ b/packages/plugin-ext/src/common/proxy-handler.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Channel, RpcProtocol, RpcProtocolOptions } from '@theia/core/'; diff --git a/packages/plugin-ext/src/common/reference-map.ts b/packages/plugin-ext/src/common/reference-map.ts index 6438b9574553f..f9dd8baa6b104 100644 --- a/packages/plugin-ext/src/common/reference-map.ts +++ b/packages/plugin-ext/src/common/reference-map.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from hhttps://github.com/microsoft/vscode/blob/6261075646f055b99068d3688932416f2346dd3b/src/vs/workbench/api/common/extHostLanguageFeatures.ts#L1291-L1310. diff --git a/packages/plugin-ext/src/common/rpc-protocol.ts b/packages/plugin-ext/src/common/rpc-protocol.ts index b05c107d805af..107c639ef2c60 100644 --- a/packages/plugin-ext/src/common/rpc-protocol.ts +++ b/packages/plugin-ext/src/common/rpc-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/semantic-tokens-dto.ts b/packages/plugin-ext/src/common/semantic-tokens-dto.ts index c72b5d906724a..428edcddf6b68 100644 --- a/packages/plugin-ext/src/common/semantic-tokens-dto.ts +++ b/packages/plugin-ext/src/common/semantic-tokens-dto.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/types.ts b/packages/plugin-ext/src/common/types.ts index 04aaec77956c1..bd64ac5e3655f 100644 --- a/packages/plugin-ext/src/common/types.ts +++ b/packages/plugin-ext/src/common/types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/microsoft/vscode/blob/1.37.0/src/vs/base/common/types.ts /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/common/uint.ts b/packages/plugin-ext/src/common/uint.ts index 5ff224faf1f39..5a8b5e2a37325 100644 --- a/packages/plugin-ext/src/common/uint.ts +++ b/packages/plugin-ext/src/common/uint.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/common/uri-components.ts b/packages/plugin-ext/src/common/uri-components.ts index 7e03144fcb8a8..f67a95657f3bd 100644 --- a/packages/plugin-ext/src/common/uri-components.ts +++ b/packages/plugin-ext/src/common/uri-components.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/hosted/browser/hosted-plugin-watcher.ts b/packages/plugin-ext/src/hosted/browser/hosted-plugin-watcher.ts index 6fb3a0c55932b..2d75532c70e97 100644 --- a/packages/plugin-ext/src/hosted/browser/hosted-plugin-watcher.ts +++ b/packages/plugin-ext/src/hosted/browser/hosted-plugin-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts b/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts index da88a9c3aa9fd..2a4ec49c7e713 100644 --- a/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts +++ b/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/hosted/browser/plugin-worker.ts b/packages/plugin-ext/src/hosted/browser/plugin-worker.ts index 6065211c436e3..e500140a553f5 100644 --- a/packages/plugin-ext/src/hosted/browser/plugin-worker.ts +++ b/packages/plugin-ext/src/hosted/browser/plugin-worker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BasicChannel } from '@theia/core/lib/common/message-rpc/channel'; import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from '@theia/core/lib/common/message-rpc/uint8-array-message-buffer'; diff --git a/packages/plugin-ext/src/hosted/browser/worker/debug-stub.ts b/packages/plugin-ext/src/hosted/browser/worker/debug-stub.ts index 69bdf1b636c8b..9dd3e48b64440 100644 --- a/packages/plugin-ext/src/hosted/browser/worker/debug-stub.ts +++ b/packages/plugin-ext/src/hosted/browser/worker/debug-stub.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line @theia/runtime-import-check diff --git a/packages/plugin-ext/src/hosted/browser/worker/plugin-manifest-loader.ts b/packages/plugin-ext/src/hosted/browser/worker/plugin-manifest-loader.ts index aebb726d27961..a20614e1b4d29 100644 --- a/packages/plugin-ext/src/hosted/browser/worker/plugin-manifest-loader.ts +++ b/packages/plugin-ext/src/hosted/browser/worker/plugin-manifest-loader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/hosted/browser/worker/worker-env-ext.ts b/packages/plugin-ext/src/hosted/browser/worker/worker-env-ext.ts index b2b931f64065a..993827d6bd50c 100644 --- a/packages/plugin-ext/src/hosted/browser/worker/worker-env-ext.ts +++ b/packages/plugin-ext/src/hosted/browser/worker/worker-env-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { EnvExtImpl } from '../../../plugin/env'; diff --git a/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts b/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts index d4f5fea2319c3..caae9776e2f18 100644 --- a/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts +++ b/packages/plugin-ext/src/hosted/browser/worker/worker-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // eslint-disable-next-line import/no-extraneous-dependencies import 'reflect-metadata'; diff --git a/packages/plugin-ext/src/hosted/node-electron/plugin-ext-hosted-electron-backend-module.ts b/packages/plugin-ext/src/hosted/node-electron/plugin-ext-hosted-electron-backend-module.ts index dff18da5e9367..6410753cd7b6f 100644 --- a/packages/plugin-ext/src/hosted/node-electron/plugin-ext-hosted-electron-backend-module.ts +++ b/packages/plugin-ext/src/hosted/node-electron/plugin-ext-hosted-electron-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node-electron/scanner-theia-electron.ts b/packages/plugin-ext/src/hosted/node-electron/scanner-theia-electron.ts index 09b772f7c2522..a4deda7539648 100644 --- a/packages/plugin-ext/src/hosted/node-electron/scanner-theia-electron.ts +++ b/packages/plugin-ext/src/hosted/node-electron/scanner-theia-electron.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-cli-contribution.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-cli-contribution.ts index 3cf0ea342efbe..e85bdb6830aba 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin-cli-contribution.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin-cli-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-deployer-handler.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-deployer-handler.ts index d6425fd29c7f4..218fa1f072881 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin-deployer-handler.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin-deployer-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-localization-service.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-localization-service.ts index 2b7a3bfd0062c..91e17f7bba3de 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin-localization-service.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin-localization-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts index 31f2255d831ee..b3a3f660fbfcc 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ConnectionErrorHandler, ContributionProvider, ILogger, MessageService } from '@theia/core/lib/common'; diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin-protocol.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin-protocol.ts index 429c2168d92ac..cbaf57be81404 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin-protocol.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Custom message protocol between `HostedPluginProcess` and its `PluginHost` child process. diff --git a/packages/plugin-ext/src/hosted/node/hosted-plugin.ts b/packages/plugin-ext/src/hosted/node/hosted-plugin.ts index 81d03a156ea20..8728caa80e2f9 100644 --- a/packages/plugin-ext/src/hosted/node/hosted-plugin.ts +++ b/packages/plugin-ext/src/hosted/node/hosted-plugin.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, multiInject, postConstruct, optional } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/metadata-scanner.ts b/packages/plugin-ext/src/hosted/node/metadata-scanner.ts index 62cb4a126157f..d03509ad4ad15 100644 --- a/packages/plugin-ext/src/hosted/node/metadata-scanner.ts +++ b/packages/plugin-ext/src/hosted/node/metadata-scanner.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, multiInject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-activation-events.ts b/packages/plugin-ext/src/hosted/node/plugin-activation-events.ts index d66a55ae329c0..a95b5138dd2d5 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-activation-events.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-activation-events.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { flatten } from '../../common/arrays'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-ext-hosted-backend-module.ts b/packages/plugin-ext/src/hosted/node/plugin-ext-hosted-backend-module.ts index 95af16e713357..a03391217c1be 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-ext-hosted-backend-module.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-ext-hosted-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts b/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts index bb32d7f20f093..ddfaaa2f01807 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-host-proxy.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import * as http from 'http'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts b/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts index 9098f36aa45fe..24658ca31bf55 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-host-rpc.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { dynamicRequire } from '@theia/core/lib/node/dynamic-require'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-host.ts b/packages/plugin-ext/src/hosted/node/plugin-host.ts index 7cd2f82720a50..0159a153e52fe 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-host.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-host.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '@theia/core/shared/reflect-metadata'; import { ConnectionClosedError, RPCProtocolImpl } from '../../common/rpc-protocol'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-language-pack-service.ts b/packages/plugin-ext/src/hosted/node/plugin-language-pack-service.ts index 2799e124181bd..2d91db5b288de 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-language-pack-service.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-language-pack-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-manifest-loader.ts b/packages/plugin-ext/src/hosted/node/plugin-manifest-loader.ts index 7dd58b90432b7..b84ed4c97f7b2 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-manifest-loader.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-manifest-loader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-reader.ts b/packages/plugin-ext/src/hosted/node/plugin-reader.ts index c4aefe4bf171b..0520e887faadc 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-reader.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-reader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/hosted/node/plugin-service.ts b/packages/plugin-ext/src/hosted/node/plugin-service.ts index 4789ffb38f0ac..1c67db3e5109d 100644 --- a/packages/plugin-ext/src/hosted/node/plugin-service.ts +++ b/packages/plugin-ext/src/hosted/node/plugin-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify'; import { HostedPluginServer, HostedPluginClient, PluginDeployer, GetDeployedPluginsParams, DeployedPlugin, PluginIdentifiers } from '../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/hosted/node/scanners/backend-init-theia.ts b/packages/plugin-ext/src/hosted/node/scanners/backend-init-theia.ts index e5998130fa654..84354f187372a 100644 --- a/packages/plugin-ext/src/hosted/node/scanners/backend-init-theia.ts +++ b/packages/plugin-ext/src/hosted/node/scanners/backend-init-theia.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/hosted/node/scanners/file-plugin-uri-factory.ts b/packages/plugin-ext/src/hosted/node/scanners/file-plugin-uri-factory.ts index f6c408126d6d9..3ad460efd6c78 100644 --- a/packages/plugin-ext/src/hosted/node/scanners/file-plugin-uri-factory.ts +++ b/packages/plugin-ext/src/hosted/node/scanners/file-plugin-uri-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/scanners/grammars-reader.ts b/packages/plugin-ext/src/hosted/node/scanners/grammars-reader.ts index e30ae0c85783c..e021ac03181cc 100644 --- a/packages/plugin-ext/src/hosted/node/scanners/grammars-reader.ts +++ b/packages/plugin-ext/src/hosted/node/scanners/grammars-reader.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/hosted/node/scanners/plugin-uri-factory.ts b/packages/plugin-ext/src/hosted/node/scanners/plugin-uri-factory.ts index 94eb4098d51fb..7c280872c3988 100644 --- a/packages/plugin-ext/src/hosted/node/scanners/plugin-uri-factory.ts +++ b/packages/plugin-ext/src/hosted/node/scanners/plugin-uri-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts b/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts index af7cc0aa46654..28306abb2af04 100644 --- a/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts +++ b/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @theia/localization-check */ diff --git a/packages/plugin-ext/src/main/browser/authentication-main.ts b/packages/plugin-ext/src/main/browser/authentication-main.ts index 88a669bcf67de..d058ba2577b2e 100644 --- a/packages/plugin-ext/src/main/browser/authentication-main.ts +++ b/packages/plugin-ext/src/main/browser/authentication-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/main/browser/clipboard-main.ts b/packages/plugin-ext/src/main/browser/clipboard-main.ts index 92809fd8f9e8b..f5a4d1fb60d6f 100644 --- a/packages/plugin-ext/src/main/browser/clipboard-main.ts +++ b/packages/plugin-ext/src/main/browser/clipboard-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/command-registry-main.ts b/packages/plugin-ext/src/main/browser/command-registry-main.ts index 599e7acca52f8..268559dc195ba 100644 --- a/packages/plugin-ext/src/main/browser/command-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/command-registry-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/commands.ts b/packages/plugin-ext/src/main/browser/commands.ts index 601484cf5c6a3..22d6479137174 100644 --- a/packages/plugin-ext/src/main/browser/commands.ts +++ b/packages/plugin-ext/src/main/browser/commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/comments/comment-glyph-widget.ts b/packages/plugin-ext/src/main/browser/comments/comment-glyph-widget.ts index e73f0c8fe595d..0463cc9f53ec3 100644 --- a/packages/plugin-ext/src/main/browser/comments/comment-glyph-widget.ts +++ b/packages/plugin-ext/src/main/browser/comments/comment-glyph-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable } from '@theia/core/lib/common'; import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/plugin-ext/src/main/browser/comments/comment-thread-widget.tsx b/packages/plugin-ext/src/main/browser/comments/comment-thread-widget.tsx index 38be0e7b7073f..1ca8cb3bc1f20 100644 --- a/packages/plugin-ext/src/main/browser/comments/comment-thread-widget.tsx +++ b/packages/plugin-ext/src/main/browser/comments/comment-thread-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MonacoEditorZoneWidget } from '@theia/monaco/lib/browser/monaco-editor-zone-widget'; import { diff --git a/packages/plugin-ext/src/main/browser/comments/comments-context-key-service.ts b/packages/plugin-ext/src/main/browser/comments/comments-context-key-service.ts index f66874e358565..c8094ae3d6bc8 100644 --- a/packages/plugin-ext/src/main/browser/comments/comments-context-key-service.ts +++ b/packages/plugin-ext/src/main/browser/comments/comments-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/comments/comments-contribution.ts b/packages/plugin-ext/src/main/browser/comments/comments-contribution.ts index c36ddb2ca4a27..a26c302bcf97a 100644 --- a/packages/plugin-ext/src/main/browser/comments/comments-contribution.ts +++ b/packages/plugin-ext/src/main/browser/comments/comments-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/comments/comments-decorator.ts b/packages/plugin-ext/src/main/browser/comments/comments-decorator.ts index 63d531a8cedc6..b48208216c921 100644 --- a/packages/plugin-ext/src/main/browser/comments/comments-decorator.ts +++ b/packages/plugin-ext/src/main/browser/comments/comments-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/comments/comments-main.ts b/packages/plugin-ext/src/main/browser/comments/comments-main.ts index 01a354ccb3c21..4aab5f5d45914 100644 --- a/packages/plugin-ext/src/main/browser/comments/comments-main.ts +++ b/packages/plugin-ext/src/main/browser/comments/comments-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/main/browser/comments/comments-service.ts b/packages/plugin-ext/src/main/browser/comments/comments-service.ts index 383feb9f1add0..8e22be9c123a7 100644 --- a/packages/plugin-ext/src/main/browser/comments/comments-service.ts +++ b/packages/plugin-ext/src/main/browser/comments/comments-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-contribution.ts b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-contribution.ts index d6898e22d8fae..485cdaa697eb4 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-contribution.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-opener.tsx b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-opener.tsx index 3656bf6b6c69c..245ab57cb1e29 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-opener.tsx +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-opener.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-service.ts b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-service.ts index c25a035a0535c..a00a39393e8e2 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-service.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget-factory.ts b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget-factory.ts index e4a59c7a22675..f1b0e2baaef52 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget-factory.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CustomEditorWidget } from '../custom-editors/custom-editor-widget'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget.ts b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget.ts index 6b72ea49295ed..5ca290804bf0a 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editor-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/custom-editors-main.ts b/packages/plugin-ext/src/main/browser/custom-editors/custom-editors-main.ts index ebe1bbd8dea28..16dfe775d7bd2 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/custom-editors-main.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/custom-editors-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/custom-editors/plugin-custom-editor-registry.ts b/packages/plugin-ext/src/main/browser/custom-editors/plugin-custom-editor-registry.ts index 7fc001e912ea4..fbb58b10f0479 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/plugin-custom-editor-registry.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/plugin-custom-editor-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/custom-editors/undo-redo-service.ts b/packages/plugin-ext/src/main/browser/custom-editors/undo-redo-service.ts index 945cc8b0605d3..36b628e23953b 100644 --- a/packages/plugin-ext/src/main/browser/custom-editors/undo-redo-service.ts +++ b/packages/plugin-ext/src/main/browser/custom-editors/undo-redo-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/data-transfer/data-transfer-type-converters.ts b/packages/plugin-ext/src/main/browser/data-transfer/data-transfer-type-converters.ts index cfddfbbd07d75..b3c5c175ed473 100644 --- a/packages/plugin-ext/src/main/browser/data-transfer/data-transfer-type-converters.ts +++ b/packages/plugin-ext/src/main/browser/data-transfer/data-transfer-type-converters.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { IDataTransferItem, VSDataTransfer } from '@theia/monaco-editor-core/esm/vs/base/common/dataTransfer'; diff --git a/packages/plugin-ext/src/main/browser/debug/debug-main.ts b/packages/plugin-ext/src/main/browser/debug/debug-main.ts index 4221473312236..8e1020a8a7fb1 100644 --- a/packages/plugin-ext/src/main/browser/debug/debug-main.ts +++ b/packages/plugin-ext/src/main/browser/debug/debug-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-adapter-contribution.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-adapter-contribution.ts index 49f3a93bfd005..cab7720b474e5 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-adapter-contribution.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-adapter-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebugExt } from '../../../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-configuration-provider.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-configuration-provider.ts index bd3e40266e2f0..6cbaa18b5dfe5 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-configuration-provider.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-configuration-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-service.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-service.ts index ecb575c109200..3c8499b802310 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-service.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebuggerDescription, DebugPath, DebugService } from '@theia/debug/lib/common/debug-service'; diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-contribution-registry.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-contribution-registry.ts index 54f5133f50049..0a2a2386fce6f 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-contribution-registry.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-contribution-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebugSessionContributionRegistry, DebugSessionContribution } from '@theia/debug/lib/browser/debug-session-contribution'; diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts index 0048b2c627816..02f88e0dc9b71 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DefaultDebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution'; diff --git a/packages/plugin-ext/src/main/browser/decorations/decorations-main.ts b/packages/plugin-ext/src/main/browser/decorations/decorations-main.ts index 0e556de085ca9..dd5f20359f5f3 100644 --- a/packages/plugin-ext/src/main/browser/decorations/decorations-main.ts +++ b/packages/plugin-ext/src/main/browser/decorations/decorations-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DecorationData, diff --git a/packages/plugin-ext/src/main/browser/dialogs-main.ts b/packages/plugin-ext/src/main/browser/dialogs-main.ts index 501bd7618a9a8..9c97c21e3cb74 100644 --- a/packages/plugin-ext/src/main/browser/dialogs-main.ts +++ b/packages/plugin-ext/src/main/browser/dialogs-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/dialogs/modal-notification.ts b/packages/plugin-ext/src/main/browser/dialogs/modal-notification.ts index 0d42eb1600850..356e1b441ff79 100644 --- a/packages/plugin-ext/src/main/browser/dialogs/modal-notification.ts +++ b/packages/plugin-ext/src/main/browser/dialogs/modal-notification.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; import { Message } from '@theia/core/shared/@phosphor/messaging'; diff --git a/packages/plugin-ext/src/main/browser/dialogs/style/modal-notification.css b/packages/plugin-ext/src/main/browser/dialogs/style/modal-notification.css index 946eaec048af6..9cf2409ee254a 100644 --- a/packages/plugin-ext/src/main/browser/dialogs/style/modal-notification.css +++ b/packages/plugin-ext/src/main/browser/dialogs/style/modal-notification.css @@ -11,113 +11,113 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .modal-Notification { - pointer-events: all; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - display: flex; - flex-direction: row; - -webkit-justify-content: center; - justify-content: center; - clear: both; - box-sizing: border-box; - position: relative; - min-width: 200px; - max-width: min(66vw, 800px); - background-color: var(--theia-editorWidget-background); - min-height: 35px; - margin-bottom: 1px; - color: var(--theia-editorWidget-foreground); + pointer-events: all; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + display: flex; + flex-direction: row; + -webkit-justify-content: center; + justify-content: center; + clear: both; + box-sizing: border-box; + position: relative; + min-width: 200px; + max-width: min(66vw, 800px); + background-color: var(--theia-editorWidget-background); + min-height: 35px; + margin-bottom: 1px; + color: var(--theia-editorWidget-foreground); } .modal-Notification .icon { - display: inline-block; - font-size: 20px; - padding: 5px 0; - width: 35px; - order: 1; + display: inline-block; + font-size: 20px; + padding: 5px 0; + width: 35px; + order: 1; } .modal-Notification .icon .codicon { - line-height: inherit; - vertical-align: middle; - font-size: calc(var(--theia-ui-padding)*5); - color: var(--theia-editorInfo-foreground); + line-height: inherit; + vertical-align: middle; + font-size: calc(var(--theia-ui-padding) * 5); + color: var(--theia-editorInfo-foreground); } .modal-Notification .icon .error { - color: var(--theia-editorError-foreground); + color: var(--theia-editorError-foreground); } .modal-Notification .icon .warning { - color: var(--theia-editorWarning-foreground); + color: var(--theia-editorWarning-foreground); } .modal-Notification .text { - order: 2; - display: inline-block; - max-height: min(66vh, 600px); - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; - align-self: center; - flex: 1 100%; - padding: 10px; - overflow: auto; - white-space: pre-wrap; + order: 2; + display: inline-block; + max-height: min(66vh, 600px); + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; + align-self: center; + flex: 1 100%; + padding: 10px; + overflow: auto; + white-space: pre-wrap; } .modal-Notification .text > p { - margin: 0; - font-size: var(--theia-ui-font-size1); - font-family: var(--theia-ui-font-family); - vertical-align: middle; + margin: 0; + font-size: var(--theia-ui-font-size1); + font-family: var(--theia-ui-font-family); + vertical-align: middle; } .modal-Notification .buttons { - display: flex; - flex-direction: row; - order: 3; - white-space: nowrap; - align-self: flex-end; - height: 40px; + display: flex; + flex-direction: row; + order: 3; + white-space: nowrap; + align-self: flex-end; + height: 40px; } .modal-Notification .buttons > button { - background-color: var(--theia-button-background); - color: var(--theia-button-foreground); - border: none; - border-radius: 0; - text-align: center; - text-decoration: none; - display: inline-block; - padding: 0 10px; - margin: 0; - font-size: var(--theia-ui-font-size1); - outline: none; - cursor: pointer; + background-color: var(--theia-button-background); + color: var(--theia-button-foreground); + border: none; + border-radius: 0; + text-align: center; + text-decoration: none; + display: inline-block; + padding: 0 10px; + margin: 0; + font-size: var(--theia-ui-font-size1); + outline: none; + cursor: pointer; } .modal-Notification .buttons > button:hover { - background-color: var(--theia-button-hoverBackground); + background-color: var(--theia-button-hoverBackground); } .modal-Notification .detail { - align-self: center; - order: 3; - flex: 1 100%; - color: var(--theia-descriptionForeground); + align-self: center; + order: 3; + flex: 1 100%; + color: var(--theia-descriptionForeground); } .modal-Notification .detail > p { - margin: calc(var(--theia-ui-padding) * 2) 0px 0px 0px; + margin: calc(var(--theia-ui-padding) * 2) 0px 0px 0px; } .modal-Notification .text { - padding: calc(var(--theia-ui-padding)*1.5); + padding: calc(var(--theia-ui-padding) * 1.5); } diff --git a/packages/plugin-ext/src/main/browser/documents-main.ts b/packages/plugin-ext/src/main/browser/documents-main.ts index 7ccd1cf19030f..798738759d998 100644 --- a/packages/plugin-ext/src/main/browser/documents-main.ts +++ b/packages/plugin-ext/src/main/browser/documents-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DocumentsMain, MAIN_RPC_CONTEXT, DocumentsExt } from '../../common/plugin-api-rpc'; import { UriComponents } from '../../common/uri-components'; diff --git a/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts b/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts index d2807b5f82ad6..c4875fca5ea23 100644 --- a/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts +++ b/packages/plugin-ext/src/main/browser/editors-and-documents-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/env-main.ts b/packages/plugin-ext/src/main/browser/env-main.ts index 400486a74c020..af9a9fa7335c9 100644 --- a/packages/plugin-ext/src/main/browser/env-main.ts +++ b/packages/plugin-ext/src/main/browser/env-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/file-system-main-impl.ts b/packages/plugin-ext/src/main/browser/file-system-main-impl.ts index 126cb3f8d06bc..143a660cd0c12 100644 --- a/packages/plugin-ext/src/main/browser/file-system-main-impl.ts +++ b/packages/plugin-ext/src/main/browser/file-system-main-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/hierarchy/hierarchy-types-converters.ts b/packages/plugin-ext/src/main/browser/hierarchy/hierarchy-types-converters.ts index 3366cb22cbc42..d506c3589e6d8 100644 --- a/packages/plugin-ext/src/main/browser/hierarchy/hierarchy-types-converters.ts +++ b/packages/plugin-ext/src/main/browser/hierarchy/hierarchy-types-converters.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall } from '@theia/callhierarchy/lib/browser'; diff --git a/packages/plugin-ext/src/main/browser/keybindings/keybindings-contribution-handler.ts b/packages/plugin-ext/src/main/browser/keybindings/keybindings-contribution-handler.ts index e15b33ddb8396..2081b73877ba8 100644 --- a/packages/plugin-ext/src/main/browser/keybindings/keybindings-contribution-handler.ts +++ b/packages/plugin-ext/src/main/browser/keybindings/keybindings-contribution-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/label-service-main.ts b/packages/plugin-ext/src/main/browser/label-service-main.ts index ef67ba06586c1..6a3e6823f4ce0 100644 --- a/packages/plugin-ext/src/main/browser/label-service-main.ts +++ b/packages/plugin-ext/src/main/browser/label-service-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { LabelServiceMain } from '../../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/main/browser/languages-main.ts b/packages/plugin-ext/src/main/browser/languages-main.ts index ed275f99e63fd..31602c5b1f23b 100644 --- a/packages/plugin-ext/src/main/browser/languages-main.ts +++ b/packages/plugin-ext/src/main/browser/languages-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/main/browser/localization-main.ts b/packages/plugin-ext/src/main/browser/localization-main.ts index ce9591e55312b..c902d3b49c9e1 100644 --- a/packages/plugin-ext/src/main/browser/localization-main.ts +++ b/packages/plugin-ext/src/main/browser/localization-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/plugin-ext/src/main/browser/main-context.ts b/packages/plugin-ext/src/main/browser/main-context.ts index 1bbb36aa7d817..7b05139454b25 100644 --- a/packages/plugin-ext/src/main/browser/main-context.ts +++ b/packages/plugin-ext/src/main/browser/main-context.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; import { CommandRegistryMainImpl } from './command-registry-main'; diff --git a/packages/plugin-ext/src/main/browser/main-file-system-event-service.ts b/packages/plugin-ext/src/main/browser/main-file-system-event-service.ts index 1a9593d9eb6cb..60509a50aa772 100644 --- a/packages/plugin-ext/src/main/browser/main-file-system-event-service.ts +++ b/packages/plugin-ext/src/main/browser/main-file-system-event-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts b/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts index fca9a17f718dd..93cddfac85016 100644 --- a/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts +++ b/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts b/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts index f4e5391dcee31..24494f98d7022 100644 --- a/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts +++ b/packages/plugin-ext/src/main/browser/menus/plugin-menu-command-adapter.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CommandRegistry, Disposable, MenuCommandAdapter, MenuPath, SelectionService, UriSelection } from '@theia/core'; diff --git a/packages/plugin-ext/src/main/browser/menus/vscode-theia-menu-mappings.ts b/packages/plugin-ext/src/main/browser/menus/vscode-theia-menu-mappings.ts index 97c04d2bb387c..f8a4b4560a022 100644 --- a/packages/plugin-ext/src/main/browser/menus/vscode-theia-menu-mappings.ts +++ b/packages/plugin-ext/src/main/browser/menus/vscode-theia-menu-mappings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MenuPath } from '@theia/core'; diff --git a/packages/plugin-ext/src/main/browser/message-registry-main.ts b/packages/plugin-ext/src/main/browser/message-registry-main.ts index 0f7ec5c064de1..5deaf5c747550 100644 --- a/packages/plugin-ext/src/main/browser/message-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/message-registry-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/notification-main.ts b/packages/plugin-ext/src/main/browser/notification-main.ts index 2014fcb235e2b..90ab72eb7203c 100644 --- a/packages/plugin-ext/src/main/browser/notification-main.ts +++ b/packages/plugin-ext/src/main/browser/notification-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { NotificationExt, NotificationMain, MAIN_RPC_CONTEXT } from '../../common'; diff --git a/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts b/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts index 4c07e21176e51..4825e92ed9c37 100644 --- a/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-authentication-service.ts b/packages/plugin-ext/src/main/browser/plugin-authentication-service.ts index 2b4cb403f14ba..13b1e809e5aaf 100644 --- a/packages/plugin-ext/src/main/browser/plugin-authentication-service.ts +++ b/packages/plugin-ext/src/main/browser/plugin-authentication-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AuthenticationProvider, AuthenticationService, AuthenticationServiceImpl, AuthenticationSession } from '@theia/core/lib/browser/authentication-service'; diff --git a/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts b/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts index a9f8f0c825ed5..fe671d99b6dd3 100644 --- a/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts +++ b/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts b/packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts index 0eb5aaf3a99d3..f737307a54961 100644 --- a/packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts +++ b/packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../../src/main/style/status-bar.css'; diff --git a/packages/plugin-ext/src/main/browser/plugin-ext-widget.tsx b/packages/plugin-ext/src/main/browser/plugin-ext-widget.tsx index 3af5c00f9d28f..be17fc1966b40 100644 --- a/packages/plugin-ext/src/main/browser/plugin-ext-widget.tsx +++ b/packages/plugin-ext/src/main/browser/plugin-ext-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/plugin-ext/src/main/browser/plugin-frontend-contribution.ts b/packages/plugin-ext/src/main/browser/plugin-frontend-contribution.ts index 47aa6ac37e4b2..bcc0f2766723a 100644 --- a/packages/plugin-ext/src/main/browser/plugin-frontend-contribution.ts +++ b/packages/plugin-ext/src/main/browser/plugin-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-frontend-view-contribution.ts b/packages/plugin-ext/src/main/browser/plugin-frontend-view-contribution.ts index 894fe1dd490c1..bd91e8254a552 100644 --- a/packages/plugin-ext/src/main/browser/plugin-frontend-view-contribution.ts +++ b/packages/plugin-ext/src/main/browser/plugin-frontend-view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-icon-theme-service.ts b/packages/plugin-ext/src/main/browser/plugin-icon-theme-service.ts index ccf815026b1d1..50290549acc36 100644 --- a/packages/plugin-ext/src/main/browser/plugin-icon-theme-service.ts +++ b/packages/plugin-ext/src/main/browser/plugin-icon-theme-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/plugin-shared-style.ts b/packages/plugin-ext/src/main/browser/plugin-shared-style.ts index 98daafcaa6450..49c2abbe72191 100644 --- a/packages/plugin-ext/src/main/browser/plugin-shared-style.ts +++ b/packages/plugin-ext/src/main/browser/plugin-shared-style.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-storage.ts b/packages/plugin-ext/src/main/browser/plugin-storage.ts index 945081196679b..cbe9cae0b0e21 100644 --- a/packages/plugin-ext/src/main/browser/plugin-storage.ts +++ b/packages/plugin-ext/src/main/browser/plugin-storage.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/plugin-terminal-registry.ts b/packages/plugin-ext/src/main/browser/plugin-terminal-registry.ts index 4eb24b7b9440a..c32ae8d500561 100644 --- a/packages/plugin-ext/src/main/browser/plugin-terminal-registry.ts +++ b/packages/plugin-ext/src/main/browser/plugin-terminal-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/preference-registry-main.ts b/packages/plugin-ext/src/main/browser/preference-registry-main.ts index 0dc5919f7d025..07a4cd3b3ea77 100644 --- a/packages/plugin-ext/src/main/browser/preference-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/preference-registry-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/main/browser/quick-open-main.ts b/packages/plugin-ext/src/main/browser/quick-open-main.ts index ed9980f5c78c1..c65d81296886e 100644 --- a/packages/plugin-ext/src/main/browser/quick-open-main.ts +++ b/packages/plugin-ext/src/main/browser/quick-open-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/main/browser/scm-main.ts b/packages/plugin-ext/src/main/browser/scm-main.ts index dec95c621c922..68af564e04111 100644 --- a/packages/plugin-ext/src/main/browser/scm-main.ts +++ b/packages/plugin-ext/src/main/browser/scm-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/main/browser/secrets-main.ts b/packages/plugin-ext/src/main/browser/secrets-main.ts index ea5629eafd1a3..fcdc111738da9 100644 --- a/packages/plugin-ext/src/main/browser/secrets-main.ts +++ b/packages/plugin-ext/src/main/browser/secrets-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/main/browser/selection-provider-command.ts b/packages/plugin-ext/src/main/browser/selection-provider-command.ts index a9b999f0c6af5..081ce28490d8c 100644 --- a/packages/plugin-ext/src/main/browser/selection-provider-command.ts +++ b/packages/plugin-ext/src/main/browser/selection-provider-command.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command'; diff --git a/packages/plugin-ext/src/main/browser/status-bar-message-registry-main.ts b/packages/plugin-ext/src/main/browser/status-bar-message-registry-main.ts index 8f9218fd6f29f..21e52a04776b5 100644 --- a/packages/plugin-ext/src/main/browser/status-bar-message-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/status-bar-message-registry-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable'; diff --git a/packages/plugin-ext/src/main/browser/style/index.css b/packages/plugin-ext/src/main/browser/style/index.css index 9939e861b91a9..a8ba00ae4400d 100644 --- a/packages/plugin-ext/src/main/browser/style/index.css +++ b/packages/plugin-ext/src/main/browser/style/index.css @@ -11,38 +11,38 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .spinnerContainer { - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; } .flexcontainer { - display: flex; + display: flex; } .row { - width: 100%; + width: 100%; } .column { - flex-direction: column; + flex-direction: column; } .theia-plugin-view-container { - /* + /* It might take a second or two until the real plugin mask is loaded To prevent flickering on the icon, we set a transparent mask instead Since masks only support images, svg or gradients, we create a transparent gradient here */ - -webkit-mask: linear-gradient(transparent, transparent); - mask: linear-gradient(transparent, transparent); - background-color: var(--theia-activityBar-inactiveForeground); + -webkit-mask: linear-gradient(transparent, transparent); + mask: linear-gradient(transparent, transparent); + background-color: var(--theia-activityBar-inactiveForeground); } .theia-plugin-file-icon, @@ -55,11 +55,11 @@ .theia-plugin-root-folder-icon::before, .theia-plugin-root-folder-expanded-icon, .theia-plugin-root-folder-expanded-icon::before { - padding-right: var(--theia-ui-padding); - width: var(--theia-icon-size); - height: var(--theia-content-line-height); - line-height: inherit !important; - display: inline-block; + padding-right: var(--theia-ui-padding); + width: var(--theia-icon-size); + height: var(--theia-content-line-height); + line-height: inherit !important; + display: inline-block; } .p-TabBar.theia-app-sides .theia-plugin-file-icon, @@ -72,14 +72,13 @@ .p-TabBar.theia-app-sides .theia-plugin-root-folder-icon::before, .p-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon, .p-TabBar.theia-app-sides .theia-plugin-root-folder-expanded-icon::before { - padding: 0px !important; - width: var(--theia-private-sidebar-icon-size) !important; - height: var(--theia-private-sidebar-icon-size) !important; - background-size: var(--theia-private-sidebar-icon-size) !important; - font-size: var(--theia-private-sidebar-icon-size) !important; + padding: 0px !important; + width: var(--theia-private-sidebar-icon-size) !important; + height: var(--theia-private-sidebar-icon-size) !important; + background-size: var(--theia-private-sidebar-icon-size) !important; + font-size: var(--theia-private-sidebar-icon-size) !important; } - -@import './plugin-sidebar.css'; -@import './webview.css'; -@import './tree.css'; +@import "./plugin-sidebar.css"; +@import "./webview.css"; +@import "./tree.css"; diff --git a/packages/plugin-ext/src/main/browser/style/plugin-sidebar.css b/packages/plugin-ext/src/main/browser/style/plugin-sidebar.css index 88f117ac87542..0772ef613890f 100644 --- a/packages/plugin-ext/src/main/browser/style/plugin-sidebar.css +++ b/packages/plugin-ext/src/main/browser/style/plugin-sidebar.css @@ -11,63 +11,63 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-plugins { - min-width: 250px !important; - display: flex; - flex-direction: column; + min-width: 250px !important; + display: flex; + flex-direction: column; } #pluginListContainer { - width: 100%; - box-sizing: border-box; - overflow-y: auto; - flex-grow: 1; + width: 100%; + box-sizing: border-box; + overflow-y: auto; + flex-grow: 1; } .theia-plugins .pluginHeaderContainer { - padding: 5px 15px; - font-size: var(--theia-ui-font-size0); + padding: 5px 15px; + font-size: var(--theia-ui-font-size0); } .theia-side-panel .theia-plugins .pluginHeaderContainer { - padding-left: 20px; + padding-left: 20px; } .theia-plugins .pluginHeaderContainer:hover { - background: var(--theia-list-hoverBackground); + background: var(--theia-list-hoverBackground); } .theia-plugins .pluginHeaderContainer .row { - margin: 3px 0; + margin: 3px 0; } .theia-plugins .pluginName { - flex: 1; - margin-right: 5px; - margin-left: 4px; - font-size: var(--theia-ui-font-size1); - font-weight: 400; + flex: 1; + margin-right: 5px; + margin-left: 4px; + font-size: var(--theia-ui-font-size1); + font-weight: 400; } .theia-plugins .pluginVersion { - flex: 1; - text-align: left; - font-size: var(--theia-ui-font-size0) + flex: 1; + text-align: left; + font-size: var(--theia-ui-font-size0); } .theia-plugins .pluginDescription { - flex: 1; + flex: 1; } .theia-plugins .pluginPublisher { - font-size: var(--theia-ui-font-size0); - flex: 5; - align-items: center; + font-size: var(--theia-ui-font-size0); + flex: 5; + align-items: center; } .plugins-tab-icon::before { - content: "\f0fe" + content: "\f0fe"; } diff --git a/packages/plugin-ext/src/main/browser/style/tree.css b/packages/plugin-ext/src/main/browser/style/tree.css index b014aca2517ac..7b03c71e2526d 100644 --- a/packages/plugin-ext/src/main/browser/style/tree.css +++ b/packages/plugin-ext/src/main/browser/style/tree.css @@ -11,42 +11,44 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-tree-view-icon { - padding-right: var(--theia-ui-padding); - -webkit-font-smoothing: antialiased; - flex-shrink: 0; - padding-left: 6px; - margin-left: -6px; + padding-right: var(--theia-ui-padding); + -webkit-font-smoothing: antialiased; + flex-shrink: 0; + padding-left: 6px; + margin-left: -6px; } .theia-tree-view-inline-action { - padding: 2px; + padding: 2px; } .theia-tree-view-description { - color: var(--theia-descriptionForeground); - font-size: var(--theia-ui-font-size0); - margin-left: var(--theia-ui-padding); + color: var(--theia-descriptionForeground); + font-size: var(--theia-ui-font-size0); + margin-left: var(--theia-ui-padding); } .theia-tree-view .theia-TreeNodeContent { - align-items: center; - height: 100%; + align-items: center; + height: 100%; } -.theia-tree-view .theia-TreeContainer .theia-TreeViewInfo { - margin-top: 7px; - margin-bottom: 10px; - margin-left: 17px; +.theia-tree-view .theia-TreeContainer .theia-TreeViewInfo { + margin-top: 7px; + margin-bottom: 10px; + margin-left: 17px; } -.theia-tree-view .theia-TreeNode:not(:hover):not(.theia-mod-selected) .theia-tree-view-inline-action { - display: none; +.theia-tree-view + .theia-TreeNode:not(:hover):not(.theia-mod-selected) + .theia-tree-view-inline-action { + display: none; } .codicon.icon-inline { - font-size: var(--theia-ui-font-size1); + font-size: var(--theia-ui-font-size1); } diff --git a/packages/plugin-ext/src/main/browser/style/webview.css b/packages/plugin-ext/src/main/browser/style/webview.css index 61a449d613eb9..41db9cf7d7488 100644 --- a/packages/plugin-ext/src/main/browser/style/webview.css +++ b/packages/plugin-ext/src/main/browser/style/webview.css @@ -11,43 +11,45 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-webview.p-mod-hidden { - visibility: hidden; - display: flex !important; + visibility: hidden; + display: flex !important; } .theia-webview { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; } .theia-webview iframe { - flex-grow: 1; - border: none; margin: 0; padding: 0; + flex-grow: 1; + border: none; + margin: 0; + padding: 0; } .theia-webview-icon { - background: none !important; - min-height: 20px; + background: none !important; + min-height: 20px; } .theia-webview-icon::before { - background-size: 13px; - background-repeat: no-repeat; - vertical-align: middle; - display: inline-block; - text-align: center; - height: 15px; - width: 15px; - content: ""; + background-size: 13px; + background-repeat: no-repeat; + vertical-align: middle; + display: inline-block; + text-align: center; + height: 15px; + width: 15px; + content: ""; } .p-TabBar.theia-app-sides .theia-webview-icon::before { - width: var(--theia-private-sidebar-icon-size); - height: var(--theia-private-sidebar-icon-size); - background-size: contain; + width: var(--theia-private-sidebar-icon-size); + height: var(--theia-private-sidebar-icon-size); + background-size: contain; } diff --git a/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts b/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts index eecc610915eb4..5375409373fb8 100644 --- a/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts +++ b/packages/plugin-ext/src/main/browser/tabs/tabs-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/tasks-main.ts b/packages/plugin-ext/src/main/browser/tasks-main.ts index 6ae5fbc722995..70b009814d59d 100644 --- a/packages/plugin-ext/src/main/browser/tasks-main.ts +++ b/packages/plugin-ext/src/main/browser/tasks-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/main/browser/terminal-main.ts b/packages/plugin-ext/src/main/browser/terminal-main.ts index d412b1b114e84..61bb2912df614 100644 --- a/packages/plugin-ext/src/main/browser/terminal-main.ts +++ b/packages/plugin-ext/src/main/browser/terminal-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/text-editor-main.ts b/packages/plugin-ext/src/main/browser/text-editor-main.ts index d9aebe0acf068..1dea02aa16b8f 100644 --- a/packages/plugin-ext/src/main/browser/text-editor-main.ts +++ b/packages/plugin-ext/src/main/browser/text-editor-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/plugin-ext/src/main/browser/text-editor-model-service.ts b/packages/plugin-ext/src/main/browser/text-editor-model-service.ts index 4a2c67799bdc2..693aca0f4ba4b 100644 --- a/packages/plugin-ext/src/main/browser/text-editor-model-service.ts +++ b/packages/plugin-ext/src/main/browser/text-editor-model-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event, Emitter } from '@theia/core'; import { MonacoEditorModel, WillSaveMonacoModelEvent } from '@theia/monaco/lib/browser/monaco-editor-model'; diff --git a/packages/plugin-ext/src/main/browser/text-editors-main.ts b/packages/plugin-ext/src/main/browser/text-editors-main.ts index 62f86c3bcc2be..879a709a04c45 100644 --- a/packages/plugin-ext/src/main/browser/text-editors-main.ts +++ b/packages/plugin-ext/src/main/browser/text-editors-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/main/browser/theme-icon-override.ts b/packages/plugin-ext/src/main/browser/theme-icon-override.ts index 7ac6b18fade03..5ac10215ddb86 100644 --- a/packages/plugin-ext/src/main/browser/theme-icon-override.ts +++ b/packages/plugin-ext/src/main/browser/theme-icon-override.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService'; diff --git a/packages/plugin-ext/src/main/browser/theming-main.ts b/packages/plugin-ext/src/main/browser/theming-main.ts index 34f6fbfacd315..a7d447d9bd30c 100644 --- a/packages/plugin-ext/src/main/browser/theming-main.ts +++ b/packages/plugin-ext/src/main/browser/theming-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MAIN_RPC_CONTEXT, ThemingMain, ThemingExt } from '../../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/main/browser/timeline-main.ts b/packages/plugin-ext/src/main/browser/timeline-main.ts index e82feb3019010..a9e23b43846ff 100644 --- a/packages/plugin-ext/src/main/browser/timeline-main.ts +++ b/packages/plugin-ext/src/main/browser/timeline-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; import { MAIN_RPC_CONTEXT, TimelineExt, TimelineMain } from '../../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/main/browser/view-column-service.ts b/packages/plugin-ext/src/main/browser/view-column-service.ts index ae2d485d895bd..a44a18b6482f3 100644 --- a/packages/plugin-ext/src/main/browser/view-column-service.ts +++ b/packages/plugin-ext/src/main/browser/view-column-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/dnd-file-content-store.ts b/packages/plugin-ext/src/main/browser/view/dnd-file-content-store.ts index 37f892828c255..47fa3324ff7ae 100644 --- a/packages/plugin-ext/src/main/browser/view/dnd-file-content-store.ts +++ b/packages/plugin-ext/src/main/browser/view/dnd-file-content-store.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/plugin-tree-view-node-label-provider.ts b/packages/plugin-ext/src/main/browser/view/plugin-tree-view-node-label-provider.ts index 7a88a5f79a4a9..011ee0638e937 100644 --- a/packages/plugin-ext/src/main/browser/view/plugin-tree-view-node-label-provider.ts +++ b/packages/plugin-ext/src/main/browser/view/plugin-tree-view-node-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts b/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts index 4e7e0934f34d9..0455fffb3c9de 100644 --- a/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts +++ b/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct, optional } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts b/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts index 14a6561ac5081..cf8d1c1a47de4 100644 --- a/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts +++ b/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-decorator-service.ts b/packages/plugin-ext/src/main/browser/view/tree-view-decorator-service.ts index c8a2d20482de3..52eb47faf8a6d 100644 --- a/packages/plugin-ext/src/main/browser/view/tree-view-decorator-service.ts +++ b/packages/plugin-ext/src/main/browser/view/tree-view-decorator-service.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { inject, injectable, interfaces, named } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx index f1ee1790743c7..d0e419fab96d0 100644 --- a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx +++ b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts index 3b80a7d50a463..9bd9edb22d073 100644 --- a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts +++ b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts b/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts index 1d364790487f5..9bda9c8303640 100644 --- a/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts +++ b/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview-views/webview-views-main.ts b/packages/plugin-ext/src/main/browser/webview-views/webview-views-main.ts index 0a155d4d4e4e8..e18ce34144d4a 100644 --- a/packages/plugin-ext/src/main/browser/webview-views/webview-views-main.ts +++ b/packages/plugin-ext/src/main/browser/webview-views/webview-views-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webview-views/webview-views.ts b/packages/plugin-ext/src/main/browser/webview-views/webview-views.ts index fa6a3d7a35abd..f660aa0d47d51 100644 --- a/packages/plugin-ext/src/main/browser/webview-views/webview-views.ts +++ b/packages/plugin-ext/src/main/browser/webview-views/webview-views.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webview/pre/host.js b/packages/plugin-ext/src/main/browser/webview/pre/host.js index 8668c0fd2fd31..399070fdce43f 100644 --- a/packages/plugin-ext/src/main/browser/webview/pre/host.js +++ b/packages/plugin-ext/src/main/browser/webview/pre/host.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webview/pre/main.js b/packages/plugin-ext/src/main/browser/webview/pre/main.js index ba23adacc41e2..402124a328720 100644 --- a/packages/plugin-ext/src/main/browser/webview/pre/main.js +++ b/packages/plugin-ext/src/main/browser/webview/pre/main.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webview/pre/service-worker.js b/packages/plugin-ext/src/main/browser/webview/pre/service-worker.js index d57fcea1e6136..c39cc3fd92828 100644 --- a/packages/plugin-ext/src/main/browser/webview/pre/service-worker.js +++ b/packages/plugin-ext/src/main/browser/webview/pre/service-worker.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. @@ -47,21 +47,21 @@ class RequestStore { this.map = new Map(); } - /** - * @param {string} webviewId - * @param {string} path - * @return {Promise | undefined} - */ + /** + * @param {string} webviewId + * @param {string} path + * @return {Promise | undefined} + */ get(webviewId, path) { const entry = this.map.get(this._key(webviewId, path)); return entry && entry.promise; } - /** - * @param {string} webviewId - * @param {string} path - * @returns {Promise} - */ + /** + * @param {string} webviewId + * @param {string} path + * @returns {Promise} + */ create(webviewId, path) { const existing = this.get(webviewId, path); if (existing) { @@ -84,12 +84,12 @@ class RequestStore { return promise; } - /** - * @param {string} webviewId - * @param {string} path - * @param {T} result - * @return {boolean} - */ + /** + * @param {string} webviewId + * @param {string} path + * @param {T} result + * @return {boolean} + */ resolve(webviewId, path, result) { const entry = this.map.get(this._key(webviewId, path)); if (!entry) { @@ -99,11 +99,11 @@ class RequestStore { return true; } - /** - * @param {string} webviewId - * @param {string} path - * @return {string} - */ + /** + * @param {string} webviewId + * @param {string} path + * @return {string} + */ _key(webviewId, path) { return `${webviewId}@@@${path}`; } diff --git a/packages/plugin-ext/src/main/browser/webview/webview-context-keys.ts b/packages/plugin-ext/src/main/browser/webview/webview-context-keys.ts index 50623a374d7b0..d85da096c04b7 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-context-keys.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-context-keys.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview-environment.ts b/packages/plugin-ext/src/main/browser/webview/webview-environment.ts index bd199670d721b..5141d940c6d8d 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-environment.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview-frontend-security-warnings.ts b/packages/plugin-ext/src/main/browser/webview/webview-frontend-security-warnings.ts index 7ddfe97c71b51..7435b78eedf0f 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-frontend-security-warnings.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-frontend-security-warnings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MessageService } from '@theia/core'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview-preferences.ts b/packages/plugin-ext/src/main/browser/webview/webview-preferences.ts index bc2ec4efce8da..960cdb97cce4d 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-preferences.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview-resource-cache.ts b/packages/plugin-ext/src/main/browser/webview/webview-resource-cache.ts index e42ab8df97980..cacb1cec2726b 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-resource-cache.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-resource-cache.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview-theme-data-provider.ts b/packages/plugin-ext/src/main/browser/webview/webview-theme-data-provider.ts index 7e7383d811e91..012bfede290a2 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-theme-data-provider.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-theme-data-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webview/webview-widget-factory.ts b/packages/plugin-ext/src/main/browser/webview/webview-widget-factory.ts index 3edb425b2a00e..47f4e89c0abfe 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview-widget-factory.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview.ts b/packages/plugin-ext/src/main/browser/webview/webview.ts index 4a561c27cea34..6a095a26a70b3 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/main/browser/webviews-main.ts b/packages/plugin-ext/src/main/browser/webviews-main.ts index f40cddc79f9bc..b6b8e29760ab2 100644 --- a/packages/plugin-ext/src/main/browser/webviews-main.ts +++ b/packages/plugin-ext/src/main/browser/webviews-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import debounce = require('@theia/core/shared/lodash.debounce'); diff --git a/packages/plugin-ext/src/main/browser/window-state-main.ts b/packages/plugin-ext/src/main/browser/window-state-main.ts index 72acd5ab56134..c7e6800855ffc 100644 --- a/packages/plugin-ext/src/main/browser/window-state-main.ts +++ b/packages/plugin-ext/src/main/browser/window-state-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/main/browser/workspace-main.ts b/packages/plugin-ext/src/main/browser/workspace-main.ts index 187d8487c8548..ea577435acee7 100644 --- a/packages/plugin-ext/src/main/browser/workspace-main.ts +++ b/packages/plugin-ext/src/main/browser/workspace-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/main/common/plugin-paths-protocol.ts b/packages/plugin-ext/src/main/common/plugin-paths-protocol.ts index bbf65db1a90a0..e1edc95463957 100644 --- a/packages/plugin-ext/src/main/common/plugin-paths-protocol.ts +++ b/packages/plugin-ext/src/main/common/plugin-paths-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const pluginPathsServicePath = '/services/plugin-paths'; diff --git a/packages/plugin-ext/src/main/common/plugin-theia-environment.ts b/packages/plugin-ext/src/main/common/plugin-theia-environment.ts index aef70dc7916b6..718ce36c4f475 100644 --- a/packages/plugin-ext/src/main/common/plugin-theia-environment.ts +++ b/packages/plugin-ext/src/main/common/plugin-theia-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/common/webview-protocol.ts b/packages/plugin-ext/src/main/common/webview-protocol.ts index 0897e6d26320d..8a79266727609 100644 --- a/packages/plugin-ext/src/main/common/webview-protocol.ts +++ b/packages/plugin-ext/src/main/common/webview-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/plugin-ext/src/main/electron-browser/plugin-ext-frontend-electron-module.ts b/packages/plugin-ext/src/main/electron-browser/plugin-ext-frontend-electron-module.ts index f1fafb4f0e0fb..f394cf13c3399 100644 --- a/packages/plugin-ext/src/main/electron-browser/plugin-ext-frontend-electron-module.ts +++ b/packages/plugin-ext/src/main/electron-browser/plugin-ext-frontend-electron-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/electron-browser/webview/electron-webview-widget-factory.ts b/packages/plugin-ext/src/main/electron-browser/webview/electron-webview-widget-factory.ts index 0832129da2f4c..2445d4ccf2244 100644 --- a/packages/plugin-ext/src/main/electron-browser/webview/electron-webview-widget-factory.ts +++ b/packages/plugin-ext/src/main/electron-browser/webview/electron-webview-widget-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { WebviewWidgetFactory } from '../../browser/webview/webview-widget-factory'; diff --git a/packages/plugin-ext/src/main/node/handlers/plugin-theia-directory-handler.ts b/packages/plugin-ext/src/main/node/handlers/plugin-theia-directory-handler.ts index 9a72946bcb5c9..284c33f1a3bd2 100644 --- a/packages/plugin-ext/src/main/node/handlers/plugin-theia-directory-handler.ts +++ b/packages/plugin-ext/src/main/node/handlers/plugin-theia-directory-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/main/node/handlers/plugin-theia-file-handler.ts b/packages/plugin-ext/src/main/node/handlers/plugin-theia-file-handler.ts index 8e0cecb65f727..337d60ca4b9a0 100644 --- a/packages/plugin-ext/src/main/node/handlers/plugin-theia-file-handler.ts +++ b/packages/plugin-ext/src/main/node/handlers/plugin-theia-file-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext, PluginType } from '../../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/paths/const.ts b/packages/plugin-ext/src/main/node/paths/const.ts index 403f76fa9fed4..0f993040d9235 100644 --- a/packages/plugin-ext/src/main/node/paths/const.ts +++ b/packages/plugin-ext/src/main/node/paths/const.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export namespace PluginPaths { diff --git a/packages/plugin-ext/src/main/node/paths/plugin-paths-service.ts b/packages/plugin-ext/src/main/node/paths/plugin-paths-service.ts index 50cab54fc3442..fa7b312d7285a 100644 --- a/packages/plugin-ext/src/main/node/paths/plugin-paths-service.ts +++ b/packages/plugin-ext/src/main/node/paths/plugin-paths-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-cli-contribution.ts b/packages/plugin-ext/src/main/node/plugin-cli-contribution.ts index 3d22c2662ab59..8f419f7df1a5d 100644 --- a/packages/plugin-ext/src/main/node/plugin-cli-contribution.ts +++ b/packages/plugin-ext/src/main/node/plugin-cli-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-contribution.ts b/packages/plugin-ext/src/main/node/plugin-deployer-contribution.ts index 9568b86383576..6ed7a21eabf88 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-contribution.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BackendApplicationContribution } from '@theia/core/lib/node'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-directory-handler-context-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-directory-handler-context-impl.ts index b7dac41d710fe..e9258876d7788 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-directory-handler-context-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-directory-handler-context-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-entry-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-entry-impl.ts index e5853c0e5689d..3f1cdbefadd6e 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-entry-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-entry-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerEntry, PluginDeployerEntryType, PluginType } from '../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-file-handler-context-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-file-handler-context-impl.ts index 97a1b54fa57bb..84497e0820e0e 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-file-handler-context-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-file-handler-context-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerEntry, PluginDeployerFileHandlerContext } from '../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts index d0e41f2144323..11f9be68ac4fa 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-proxy-entry-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-proxy-entry-impl.ts index e4fd4a9c3c2e7..93c5b5c067761 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-proxy-entry-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-proxy-entry-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; import { PluginDeployerEntry, PluginDeployerEntryType, PluginType } from '../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-resolver-context-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-resolver-context-impl.ts index c40283fda553f..e299b7691fd9c 100644 --- a/packages/plugin-ext/src/main/node/plugin-deployer-resolver-context-impl.ts +++ b/packages/plugin-ext/src/main/node/plugin-deployer-resolver-context-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerResolverContext, PluginDeployerEntry, PluginDeployerResolverInit } from '../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts b/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts index 4636d10d18c9b..24a26822bba67 100644 --- a/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts +++ b/packages/plugin-ext/src/main/node/plugin-ext-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-github-resolver.ts b/packages/plugin-ext/src/main/node/plugin-github-resolver.ts index 1dc192bb16280..a0ccb087e941b 100644 --- a/packages/plugin-ext/src/main/node/plugin-github-resolver.ts +++ b/packages/plugin-ext/src/main/node/plugin-github-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { RequestContext, RequestService } from '@theia/core/shared/@theia/request'; diff --git a/packages/plugin-ext/src/main/node/plugin-http-resolver.ts b/packages/plugin-ext/src/main/node/plugin-http-resolver.ts index 64ef8eca454d0..971ba3d0d8d22 100644 --- a/packages/plugin-ext/src/main/node/plugin-http-resolver.ts +++ b/packages/plugin-ext/src/main/node/plugin-http-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { RequestContext, RequestService } from '@theia/core/shared/@theia/request'; diff --git a/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts b/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts index 2f5c3aff101a6..c6d286e5b3d5c 100644 --- a/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts +++ b/packages/plugin-ext/src/main/node/plugin-localization-backend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-server-handler.ts b/packages/plugin-ext/src/main/node/plugin-server-handler.ts index 9b313218b5f7d..a40df614b9b7c 100644 --- a/packages/plugin-ext/src/main/node/plugin-server-handler.ts +++ b/packages/plugin-ext/src/main/node/plugin-server-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-service.ts b/packages/plugin-ext/src/main/node/plugin-service.ts index d58c6e935cae6..15f51b6eec4f8 100644 --- a/packages/plugin-ext/src/main/node/plugin-service.ts +++ b/packages/plugin-ext/src/main/node/plugin-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as http from 'http'; diff --git a/packages/plugin-ext/src/main/node/plugin-theia-deployer-participant.ts b/packages/plugin-ext/src/main/node/plugin-theia-deployer-participant.ts index 1a94f1cdd1111..2ad5196545bf2 100644 --- a/packages/plugin-ext/src/main/node/plugin-theia-deployer-participant.ts +++ b/packages/plugin-ext/src/main/node/plugin-theia-deployer-participant.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/plugin-uninstallation-manager.ts b/packages/plugin-ext/src/main/node/plugin-uninstallation-manager.ts index 1ea021c7b0e25..dfba80f9d5133 100644 --- a/packages/plugin-ext/src/main/node/plugin-uninstallation-manager.ts +++ b/packages/plugin-ext/src/main/node/plugin-uninstallation-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter, Event } from '@theia/core'; diff --git a/packages/plugin-ext/src/main/node/plugins-key-value-storage.spec.ts b/packages/plugin-ext/src/main/node/plugins-key-value-storage.spec.ts index 9850398a052d6..c9ce35e0220da 100644 --- a/packages/plugin-ext/src/main/node/plugins-key-value-storage.spec.ts +++ b/packages/plugin-ext/src/main/node/plugins-key-value-storage.spec.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import 'reflect-metadata'; diff --git a/packages/plugin-ext/src/main/node/plugins-key-value-storage.ts b/packages/plugin-ext/src/main/node/plugins-key-value-storage.ts index 64052abad8921..464f160fd04c7 100644 --- a/packages/plugin-ext/src/main/node/plugins-key-value-storage.ts +++ b/packages/plugin-ext/src/main/node/plugins-key-value-storage.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { deepmerge } from '@theia/core/shared/@theia/application-package'; diff --git a/packages/plugin-ext/src/main/node/resolvers/local-directory-plugin-deployer-resolver.ts b/packages/plugin-ext/src/main/node/resolvers/local-directory-plugin-deployer-resolver.ts index 7ef6f70049a8b..be0d9b5acc814 100644 --- a/packages/plugin-ext/src/main/node/resolvers/local-directory-plugin-deployer-resolver.ts +++ b/packages/plugin-ext/src/main/node/resolvers/local-directory-plugin-deployer-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDeployerResolverContext } from '../../../common/plugin-protocol'; diff --git a/packages/plugin-ext/src/main/node/resolvers/local-plugin-deployer-resolver.ts b/packages/plugin-ext/src/main/node/resolvers/local-plugin-deployer-resolver.ts index b93c555bfa74f..a974b4bb76134 100644 --- a/packages/plugin-ext/src/main/node/resolvers/local-plugin-deployer-resolver.ts +++ b/packages/plugin-ext/src/main/node/resolvers/local-plugin-deployer-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/main/node/temp-dir-util.ts b/packages/plugin-ext/src/main/node/temp-dir-util.ts index 40a4d6634e07a..c0285be99c802 100644 --- a/packages/plugin-ext/src/main/node/temp-dir-util.ts +++ b/packages/plugin-ext/src/main/node/temp-dir-util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as os from 'os'; import * as path from 'path'; diff --git a/packages/plugin-ext/src/main/node/webview-backend-security-warnings.ts b/packages/plugin-ext/src/main/node/webview-backend-security-warnings.ts index f155f7acd794c..d03ba9f03d1b8 100644 --- a/packages/plugin-ext/src/main/node/webview-backend-security-warnings.ts +++ b/packages/plugin-ext/src/main/node/webview-backend-security-warnings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { BackendApplicationContribution } from '@theia/core/lib/node'; diff --git a/packages/plugin-ext/src/main/style/status-bar.css b/packages/plugin-ext/src/main/style/status-bar.css index 43c38e56c6e23..45e98d9be0e0d 100644 --- a/packages/plugin-ext/src/main/style/status-bar.css +++ b/packages/plugin-ext/src/main/style/status-bar.css @@ -11,25 +11,25 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #theia-statusBar .development-host { - background-color: var(--theia-successBackground); + background-color: var(--theia-successBackground); } #theia-statusBar .development-host-offline { - background-color: var(--theia-errorBackground); + background-color: var(--theia-errorBackground); } #theia-statusBar .hosted-plugin { - background-color: var(--theia-inputValidation-infoBackground); + background-color: var(--theia-inputValidation-infoBackground); } #theia-statusBar .hosted-plugin:hover { - background-color: var(--theia-editorInfo-foreground); + background-color: var(--theia-editorInfo-foreground); } #theia-statusBar .hosted-plugin-failed { - background-color: var(--theia-errorBackground); + background-color: var(--theia-errorBackground); } diff --git a/packages/plugin-ext/src/plugin-ext-backend-electron-module.ts b/packages/plugin-ext/src/plugin-ext-backend-electron-module.ts index ca1fd59d6bce0..5bd57c86c1410 100644 --- a/packages/plugin-ext/src/plugin-ext-backend-electron-module.ts +++ b/packages/plugin-ext/src/plugin-ext-backend-electron-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/plugin-ext-backend-module.ts b/packages/plugin-ext/src/plugin-ext-backend-module.ts index 6093561e11ff1..7a5be4fff0752 100644 --- a/packages/plugin-ext/src/plugin-ext-backend-module.ts +++ b/packages/plugin-ext/src/plugin-ext-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-ext/src/plugin-ext-frontend-electron-module.ts b/packages/plugin-ext/src/plugin-ext-frontend-electron-module.ts index 8d5708bf845e5..a20b408db79a2 100644 --- a/packages/plugin-ext/src/plugin-ext-frontend-electron-module.ts +++ b/packages/plugin-ext/src/plugin-ext-frontend-electron-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import mainModule from './main/electron-browser/plugin-ext-frontend-electron-module'; diff --git a/packages/plugin-ext/src/plugin-ext-frontend-module.ts b/packages/plugin-ext/src/plugin-ext-frontend-module.ts index 54c6c1f68f2ac..7841887edb96b 100644 --- a/packages/plugin-ext/src/plugin-ext-frontend-module.ts +++ b/packages/plugin-ext/src/plugin-ext-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import mainModule from './main/browser/plugin-ext-frontend-module'; diff --git a/packages/plugin-ext/src/plugin/authentication-ext.ts b/packages/plugin-ext/src/plugin/authentication-ext.ts index 224ff3216caf1..b8977bf33509c 100644 --- a/packages/plugin-ext/src/plugin/authentication-ext.ts +++ b/packages/plugin-ext/src/plugin/authentication-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/plugin/clipboard-ext.ts b/packages/plugin-ext/src/plugin/clipboard-ext.ts index e5700b3be314f..363f83085be88 100644 --- a/packages/plugin-ext/src/plugin/clipboard-ext.ts +++ b/packages/plugin-ext/src/plugin/clipboard-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/command-registry.ts b/packages/plugin-ext/src/plugin/command-registry.ts index 17c5003aa8618..a6dad6a23967d 100644 --- a/packages/plugin-ext/src/plugin/command-registry.ts +++ b/packages/plugin-ext/src/plugin/command-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/comments.ts b/packages/plugin-ext/src/plugin/comments.ts index e6d810dba9c5a..3da887facb172 100644 --- a/packages/plugin-ext/src/plugin/comments.ts +++ b/packages/plugin-ext/src/plugin/comments.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/custom-editors.ts b/packages/plugin-ext/src/plugin/custom-editors.ts index 2bce09b56f322..901d05dc7f8fd 100644 --- a/packages/plugin-ext/src/plugin/custom-editors.ts +++ b/packages/plugin-ext/src/plugin/custom-editors.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/debug/debug-ext.ts b/packages/plugin-ext/src/plugin/debug/debug-ext.ts index 498c309d3ffd0..bc896a9be928a 100644 --- a/packages/plugin-ext/src/plugin/debug/debug-ext.ts +++ b/packages/plugin-ext/src/plugin/debug/debug-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter } from '@theia/core/lib/common/event'; import { Path } from '@theia/core/lib/common/path'; diff --git a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-creator.ts b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-creator.ts index b5c6f450bee76..5693025ec1c2c 100644 --- a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-creator.ts +++ b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-creator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-session.ts b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-session.ts index 098194d994b08..6aab7251dffdc 100644 --- a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-session.ts +++ b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-session.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DebugAdapterSessionImpl } from '@theia/debug/lib/common/debug-adapter-session'; diff --git a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-tracker.ts b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-tracker.ts index 936fb9ac47614..19fa3ef25738e 100644 --- a/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-tracker.ts +++ b/packages/plugin-ext/src/plugin/debug/plugin-debug-adapter-tracker.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/decorations.ts b/packages/plugin-ext/src/plugin/decorations.ts index d0cc2688acbba..f46abcaf908ef 100644 --- a/packages/plugin-ext/src/plugin/decorations.ts +++ b/packages/plugin-ext/src/plugin/decorations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/dialogs.ts b/packages/plugin-ext/src/plugin/dialogs.ts index 16874c5dc24e1..129be4cc6e0af 100644 --- a/packages/plugin-ext/src/plugin/dialogs.ts +++ b/packages/plugin-ext/src/plugin/dialogs.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PLUGIN_RPC_CONTEXT as Ext, OpenDialogOptionsMain, DialogsMain, SaveDialogOptionsMain, UploadDialogOptionsMain } from '../common/plugin-api-rpc'; import { OpenDialogOptions, SaveDialogOptions, UploadDialogOptions } from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/document-data.ts b/packages/plugin-ext/src/plugin/document-data.ts index 943a0fa636214..c372a9b92778b 100644 --- a/packages/plugin-ext/src/plugin/document-data.ts +++ b/packages/plugin-ext/src/plugin/document-data.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/documents.ts b/packages/plugin-ext/src/plugin/documents.ts index 4b756f7f85c64..3eee7ade3a3d6 100644 --- a/packages/plugin-ext/src/plugin/documents.ts +++ b/packages/plugin-ext/src/plugin/documents.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/editors-and-documents.ts b/packages/plugin-ext/src/plugin/editors-and-documents.ts index 823f7cf43bc24..cf299753269d2 100644 --- a/packages/plugin-ext/src/plugin/editors-and-documents.ts +++ b/packages/plugin-ext/src/plugin/editors-and-documents.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { EditorsAndDocumentsExt, EditorsAndDocumentsDelta, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/plugin/env.ts b/packages/plugin-ext/src/plugin/env.ts index f289c11da92d2..80547683d52fa 100644 --- a/packages/plugin-ext/src/plugin/env.ts +++ b/packages/plugin-ext/src/plugin/env.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/file-system-event-service-ext-impl.ts b/packages/plugin-ext/src/plugin/file-system-event-service-ext-impl.ts index 779d2c085787a..8a9398ce6c99e 100644 --- a/packages/plugin-ext/src/plugin/file-system-event-service-ext-impl.ts +++ b/packages/plugin-ext/src/plugin/file-system-event-service-ext-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/file-system-ext-impl.ts b/packages/plugin-ext/src/plugin/file-system-ext-impl.ts index c02e429ed6131..f4db210a78ae3 100644 --- a/packages/plugin-ext/src/plugin/file-system-ext-impl.ts +++ b/packages/plugin-ext/src/plugin/file-system-ext-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/known-commands.spec.ts b/packages/plugin-ext/src/plugin/known-commands.spec.ts index c7f0585edfba2..97b800bb1ac30 100644 --- a/packages/plugin-ext/src/plugin/known-commands.spec.ts +++ b/packages/plugin-ext/src/plugin/known-commands.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/plugin-ext/src/plugin/known-commands.ts b/packages/plugin-ext/src/plugin/known-commands.ts index 76cfcfbfda8c7..26233eeaa35a1 100755 --- a/packages/plugin-ext/src/plugin/known-commands.ts +++ b/packages/plugin-ext/src/plugin/known-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/label-service.ts b/packages/plugin-ext/src/plugin/label-service.ts index 8e588dc0d4c72..5a99879bd4072 100644 --- a/packages/plugin-ext/src/plugin/label-service.ts +++ b/packages/plugin-ext/src/plugin/label-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ResourceLabelFormatter } from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages-utils.ts b/packages/plugin-ext/src/plugin/languages-utils.ts index a5f20edf7ab05..d52f922f42ed8 100644 --- a/packages/plugin-ext/src/plugin/languages-utils.ts +++ b/packages/plugin-ext/src/plugin/languages-utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages.ts b/packages/plugin-ext/src/plugin/languages.ts index df2d6d1ea8a8a..fbabb5888525b 100644 --- a/packages/plugin-ext/src/plugin/languages.ts +++ b/packages/plugin-ext/src/plugin/languages.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts b/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts index c9f3499e0cc5d..b937986434e6a 100644 --- a/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts +++ b/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/code-action.ts b/packages/plugin-ext/src/plugin/languages/code-action.ts index 3e235e698fa42..42828b99f85c5 100644 --- a/packages/plugin-ext/src/plugin/languages/code-action.ts +++ b/packages/plugin-ext/src/plugin/languages/code-action.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/color.ts b/packages/plugin-ext/src/plugin/languages/color.ts index 050c634bee7f9..4fea42531f278 100644 --- a/packages/plugin-ext/src/plugin/languages/color.ts +++ b/packages/plugin-ext/src/plugin/languages/color.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/completion.ts b/packages/plugin-ext/src/plugin/languages/completion.ts index 1d5bfa16925f1..1cbb1ae63f59a 100644 --- a/packages/plugin-ext/src/plugin/languages/completion.ts +++ b/packages/plugin-ext/src/plugin/languages/completion.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/declaration.ts b/packages/plugin-ext/src/plugin/languages/declaration.ts index c06be955e0275..5a842e4d0c946 100644 --- a/packages/plugin-ext/src/plugin/languages/declaration.ts +++ b/packages/plugin-ext/src/plugin/languages/declaration.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/definition.ts b/packages/plugin-ext/src/plugin/languages/definition.ts index 8a2a8fbfd411d..6292542ef4e28 100644 --- a/packages/plugin-ext/src/plugin/languages/definition.ts +++ b/packages/plugin-ext/src/plugin/languages/definition.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/diagnostics.ts b/packages/plugin-ext/src/plugin/languages/diagnostics.ts index bc29e08b9addd..ea74544b09ea2 100644 --- a/packages/plugin-ext/src/plugin/languages/diagnostics.ts +++ b/packages/plugin-ext/src/plugin/languages/diagnostics.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/document-drop-edit.ts b/packages/plugin-ext/src/plugin/languages/document-drop-edit.ts index e5bf616e3189a..d160b5a59d6dd 100644 --- a/packages/plugin-ext/src/plugin/languages/document-drop-edit.ts +++ b/packages/plugin-ext/src/plugin/languages/document-drop-edit.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; import { DataTransferDTO, DocumentDropEdit } from '../../common/plugin-api-rpc-model'; diff --git a/packages/plugin-ext/src/plugin/languages/document-formatting.ts b/packages/plugin-ext/src/plugin/languages/document-formatting.ts index b0d986065903c..ea87804c7477e 100644 --- a/packages/plugin-ext/src/plugin/languages/document-formatting.ts +++ b/packages/plugin-ext/src/plugin/languages/document-formatting.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/document-highlight.ts b/packages/plugin-ext/src/plugin/languages/document-highlight.ts index 152de8d002dfa..cda339cc2a7aa 100644 --- a/packages/plugin-ext/src/plugin/languages/document-highlight.ts +++ b/packages/plugin-ext/src/plugin/languages/document-highlight.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/evaluatable-expression.ts b/packages/plugin-ext/src/plugin/languages/evaluatable-expression.ts index ea7fb6f643b3f..e25e95aa89962 100644 --- a/packages/plugin-ext/src/plugin/languages/evaluatable-expression.ts +++ b/packages/plugin-ext/src/plugin/languages/evaluatable-expression.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/folding.ts b/packages/plugin-ext/src/plugin/languages/folding.ts index 50bb273375ecb..251d6c8cb4a24 100644 --- a/packages/plugin-ext/src/plugin/languages/folding.ts +++ b/packages/plugin-ext/src/plugin/languages/folding.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/hover.ts b/packages/plugin-ext/src/plugin/languages/hover.ts index 577c6cce38b6a..a0da9b555622b 100644 --- a/packages/plugin-ext/src/plugin/languages/hover.ts +++ b/packages/plugin-ext/src/plugin/languages/hover.ts @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/implementation.ts b/packages/plugin-ext/src/plugin/languages/implementation.ts index e47c4215b222b..107401513ec33 100644 --- a/packages/plugin-ext/src/plugin/languages/implementation.ts +++ b/packages/plugin-ext/src/plugin/languages/implementation.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/inlay-hints.ts b/packages/plugin-ext/src/plugin/languages/inlay-hints.ts index 3a1562bd139a6..e63d159274d02 100644 --- a/packages/plugin-ext/src/plugin/languages/inlay-hints.ts +++ b/packages/plugin-ext/src/plugin/languages/inlay-hints.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/languages/inline-completion.ts b/packages/plugin-ext/src/plugin/languages/inline-completion.ts index 67b5a64c0b86b..b46b77ac05365 100644 --- a/packages/plugin-ext/src/plugin/languages/inline-completion.ts +++ b/packages/plugin-ext/src/plugin/languages/inline-completion.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/microsoft/vscode/blob/6261075646f055b99068d3688932416f2346dd3b/src/vs/workbench/api/common/extHostLanguageFeatures.ts#L1069-L1185. diff --git a/packages/plugin-ext/src/plugin/languages/inline-values.ts b/packages/plugin-ext/src/plugin/languages/inline-values.ts index 0b608780ebfe4..18fda4ad6a438 100644 --- a/packages/plugin-ext/src/plugin/languages/inline-values.ts +++ b/packages/plugin-ext/src/plugin/languages/inline-values.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/lens.ts b/packages/plugin-ext/src/plugin/languages/lens.ts index df90a47cb3ff2..7eca5093d5794 100644 --- a/packages/plugin-ext/src/plugin/languages/lens.ts +++ b/packages/plugin-ext/src/plugin/languages/lens.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/link-provider.ts b/packages/plugin-ext/src/plugin/languages/link-provider.ts index c388988f85324..bb06c3be251bf 100644 --- a/packages/plugin-ext/src/plugin/languages/link-provider.ts +++ b/packages/plugin-ext/src/plugin/languages/link-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/linked-editing-range.ts b/packages/plugin-ext/src/plugin/languages/linked-editing-range.ts index 3f7e853b5b901..d1450bf0da520 100644 --- a/packages/plugin-ext/src/plugin/languages/linked-editing-range.ts +++ b/packages/plugin-ext/src/plugin/languages/linked-editing-range.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts b/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts index ed28869de516d..fa3c12b1d5b8a 100644 --- a/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts +++ b/packages/plugin-ext/src/plugin/languages/on-type-formatting.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/outline.ts b/packages/plugin-ext/src/plugin/languages/outline.ts index 21ffb6f049d0c..6c6b6421ba267 100644 --- a/packages/plugin-ext/src/plugin/languages/outline.ts +++ b/packages/plugin-ext/src/plugin/languages/outline.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/range-formatting.ts b/packages/plugin-ext/src/plugin/languages/range-formatting.ts index e5143941cac0d..78887eefb41be 100644 --- a/packages/plugin-ext/src/plugin/languages/range-formatting.ts +++ b/packages/plugin-ext/src/plugin/languages/range-formatting.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/reference.ts b/packages/plugin-ext/src/plugin/languages/reference.ts index e63f82bbd8dde..deb6dfefeeed2 100644 --- a/packages/plugin-ext/src/plugin/languages/reference.ts +++ b/packages/plugin-ext/src/plugin/languages/reference.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/rename.ts b/packages/plugin-ext/src/plugin/languages/rename.ts index ba9cf280f5129..bcd71723bc28a 100644 --- a/packages/plugin-ext/src/plugin/languages/rename.ts +++ b/packages/plugin-ext/src/plugin/languages/rename.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/selection-range.ts b/packages/plugin-ext/src/plugin/languages/selection-range.ts index b8c15a43cc974..d43a29a24c8cf 100644 --- a/packages/plugin-ext/src/plugin/languages/selection-range.ts +++ b/packages/plugin-ext/src/plugin/languages/selection-range.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/languages/semantic-highlighting.ts b/packages/plugin-ext/src/plugin/languages/semantic-highlighting.ts index 4ace9cc97611b..50756bb53ed9f 100644 --- a/packages/plugin-ext/src/plugin/languages/semantic-highlighting.ts +++ b/packages/plugin-ext/src/plugin/languages/semantic-highlighting.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/languages/signature.ts b/packages/plugin-ext/src/plugin/languages/signature.ts index 20cb1e0f4a7ef..bc0d38767622f 100644 --- a/packages/plugin-ext/src/plugin/languages/signature.ts +++ b/packages/plugin-ext/src/plugin/languages/signature.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/languages/type-definition.ts b/packages/plugin-ext/src/plugin/languages/type-definition.ts index 2c1622b2db26d..eb9e110156f72 100644 --- a/packages/plugin-ext/src/plugin/languages/type-definition.ts +++ b/packages/plugin-ext/src/plugin/languages/type-definition.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/type-hierarchy.ts b/packages/plugin-ext/src/plugin/languages/type-hierarchy.ts index a166f0e40cbe6..938b1485ae65c 100644 --- a/packages/plugin-ext/src/plugin/languages/type-hierarchy.ts +++ b/packages/plugin-ext/src/plugin/languages/type-hierarchy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core/shared/vscode-uri'; diff --git a/packages/plugin-ext/src/plugin/languages/util.ts b/packages/plugin-ext/src/plugin/languages/util.ts index 2918f5edcf0a2..efde0de1b043a 100644 --- a/packages/plugin-ext/src/plugin/languages/util.ts +++ b/packages/plugin-ext/src/plugin/languages/util.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/languages/workspace-symbol.ts b/packages/plugin-ext/src/plugin/languages/workspace-symbol.ts index 7f80c6073ff59..7ba4837a539a9 100644 --- a/packages/plugin-ext/src/plugin/languages/workspace-symbol.ts +++ b/packages/plugin-ext/src/plugin/languages/workspace-symbol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SymbolInformation } from '@theia/core/shared/vscode-languageserver-protocol'; diff --git a/packages/plugin-ext/src/plugin/localization-ext.ts b/packages/plugin-ext/src/plugin/localization-ext.ts index b9905bdd59f29..0e93969a1ec95 100644 --- a/packages/plugin-ext/src/plugin/localization-ext.ts +++ b/packages/plugin-ext/src/plugin/localization-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/markdown-string.ts b/packages/plugin-ext/src/plugin/markdown-string.ts index 9fcf1fbff0fab..51dff7c905859 100644 --- a/packages/plugin-ext/src/plugin/markdown-string.ts +++ b/packages/plugin-ext/src/plugin/markdown-string.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Mutable } from '@theia/core'; diff --git a/packages/plugin-ext/src/plugin/message-registry.ts b/packages/plugin-ext/src/plugin/message-registry.ts index 56e655242a7fd..016f518dec9c3 100644 --- a/packages/plugin-ext/src/plugin/message-registry.ts +++ b/packages/plugin-ext/src/plugin/message-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PLUGIN_RPC_CONTEXT as Ext, MessageRegistryMain, MainMessageOptions, MainMessageType diff --git a/packages/plugin-ext/src/plugin/node/debug/debug.spec.ts b/packages/plugin-ext/src/plugin/node/debug/debug.spec.ts index fba237feb742a..16b2c330ac252 100644 --- a/packages/plugin-ext/src/plugin/node/debug/debug.spec.ts +++ b/packages/plugin-ext/src/plugin/node/debug/debug.spec.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ import { DebugSession } from '@theia/plugin'; import * as chai from 'chai'; diff --git a/packages/plugin-ext/src/plugin/node/debug/plugin-node-debug-adapter-creator.ts b/packages/plugin-ext/src/plugin/node/debug/plugin-node-debug-adapter-creator.ts index ffda0f04e4ddd..fb5722e3fe385 100644 --- a/packages/plugin-ext/src/plugin/node/debug/plugin-node-debug-adapter-creator.ts +++ b/packages/plugin-ext/src/plugin/node/debug/plugin-node-debug-adapter-creator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginDebugAdapterCreator } from '../../debug/plugin-debug-adapter-creator'; diff --git a/packages/plugin-ext/src/plugin/node/env-node-ext.ts b/packages/plugin-ext/src/plugin/node/env-node-ext.ts index c1e6f75a5fee8..65924f11b95e6 100644 --- a/packages/plugin-ext/src/plugin/node/env-node-ext.ts +++ b/packages/plugin-ext/src/plugin/node/env-node-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as mac from 'macaddress'; diff --git a/packages/plugin-ext/src/plugin/notification.ts b/packages/plugin-ext/src/plugin/notification.ts index 45a44ded04548..24e47a0403696 100644 --- a/packages/plugin-ext/src/plugin/notification.ts +++ b/packages/plugin-ext/src/plugin/notification.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PLUGIN_RPC_CONTEXT, NotificationExt, NotificationMain } from '../common/plugin-api-rpc'; @@ -35,7 +35,7 @@ export class NotificationExtImpl implements NotificationExt { ): Promise { const source = new CancellationTokenSource(); const id = new Deferred(); - const progress = task({ report: async item => this.proxy.$updateProgress(await id.promise, item)}, source.token); + const progress = task({ report: async item => this.proxy.$updateProgress(await id.promise, item) }, source.token); const title = options.title ? options.title : ''; const location = this.mapLocation(options.location); const cancellable = options.cancellable; diff --git a/packages/plugin-ext/src/plugin/output-channel-registry.ts b/packages/plugin-ext/src/plugin/output-channel-registry.ts index 4849ab7db9604..7e34eef77643b 100644 --- a/packages/plugin-ext/src/plugin/output-channel-registry.ts +++ b/packages/plugin-ext/src/plugin/output-channel-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/output-channel/log-output-channel.ts b/packages/plugin-ext/src/plugin/output-channel/log-output-channel.ts index d12a0c1c88225..b0cfdde8c952c 100644 --- a/packages/plugin-ext/src/plugin/output-channel/log-output-channel.ts +++ b/packages/plugin-ext/src/plugin/output-channel/log-output-channel.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts b/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts index 043ec3e85ffed..fd8c9c047136b 100644 --- a/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts +++ b/packages/plugin-ext/src/plugin/output-channel/output-channel-item.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; import { OutputChannelRegistryMain, PluginInfo } from '../../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/plugin/path.spec.ts b/packages/plugin-ext/src/plugin/path.spec.ts index dd7b47d1dea72..e5895658fdc73 100644 --- a/packages/plugin-ext/src/plugin/path.spec.ts +++ b/packages/plugin-ext/src/plugin/path.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/plugin-ext/src/plugin/path.ts b/packages/plugin-ext/src/plugin/path.ts index 08cebb0ab1256..71e780f0486ca 100644 --- a/packages/plugin-ext/src/plugin/path.ts +++ b/packages/plugin-ext/src/plugin/path.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const separator = '/'; diff --git a/packages/plugin-ext/src/plugin/plugin-context.ts b/packages/plugin-ext/src/plugin/plugin-context.ts index 80ad2b1dacb15..49e10929e7235 100644 --- a/packages/plugin-ext/src/plugin/plugin-context.ts +++ b/packages/plugin-ext/src/plugin/plugin-context.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/plugin-icon-path.ts b/packages/plugin-ext/src/plugin/plugin-icon-path.ts index 4b1bf72865b1c..610e7dcc1b3af 100644 --- a/packages/plugin-ext/src/plugin/plugin-icon-path.ts +++ b/packages/plugin-ext/src/plugin/plugin-icon-path.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/plugin-ext/src/plugin/plugin-manager.ts b/packages/plugin-ext/src/plugin/plugin-manager.ts index 988d043e21f27..541ce9a4f350f 100644 --- a/packages/plugin-ext/src/plugin/plugin-manager.ts +++ b/packages/plugin-ext/src/plugin/plugin-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/plugin/plugin-storage.ts b/packages/plugin-ext/src/plugin/plugin-storage.ts index 45eb129f0b08d..9a9449ea44d76 100644 --- a/packages/plugin-ext/src/plugin/plugin-storage.ts +++ b/packages/plugin-ext/src/plugin/plugin-storage.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/preference-registry.spec.ts b/packages/plugin-ext/src/plugin/preference-registry.spec.ts index e5e1143386fe2..8874ccfff41fd 100644 --- a/packages/plugin-ext/src/plugin/preference-registry.spec.ts +++ b/packages/plugin-ext/src/plugin/preference-registry.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceRegistryExtImpl, PreferenceScope } from './preference-registry'; diff --git a/packages/plugin-ext/src/plugin/preference-registry.ts b/packages/plugin-ext/src/plugin/preference-registry.ts index 41863443a0abc..465c7122ec4af 100644 --- a/packages/plugin-ext/src/plugin/preference-registry.ts +++ b/packages/plugin-ext/src/plugin/preference-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/prefix-sum-computer.ts b/packages/plugin-ext/src/plugin/prefix-sum-computer.ts index 65dc9e62e5c19..73e992102f86f 100644 --- a/packages/plugin-ext/src/plugin/prefix-sum-computer.ts +++ b/packages/plugin-ext/src/plugin/prefix-sum-computer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Copied from https://github.com/Microsoft/vscode/blob/master/src/vs/editor/common/viewModel/prefixSumComputer.ts diff --git a/packages/plugin-ext/src/plugin/quick-open.ts b/packages/plugin-ext/src/plugin/quick-open.ts index 12ef3a1e67492..ad2975571403d 100644 --- a/packages/plugin-ext/src/plugin/quick-open.ts +++ b/packages/plugin-ext/src/plugin/quick-open.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ import { diff --git a/packages/plugin-ext/src/plugin/scm.ts b/packages/plugin-ext/src/plugin/scm.ts index 2586c2638ecb2..4703ab3626f14 100644 --- a/packages/plugin-ext/src/plugin/scm.ts +++ b/packages/plugin-ext/src/plugin/scm.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/plugin/secrets-ext.ts b/packages/plugin-ext/src/plugin/secrets-ext.ts index fa594bbfbc159..5bd9a18bbabcf 100644 --- a/packages/plugin-ext/src/plugin/secrets-ext.ts +++ b/packages/plugin-ext/src/plugin/secrets-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/plugin/status-bar-message-registry.ts b/packages/plugin-ext/src/plugin/status-bar-message-registry.ts index 7206e79d3b658..7baf9185ed26c 100644 --- a/packages/plugin-ext/src/plugin/status-bar-message-registry.ts +++ b/packages/plugin-ext/src/plugin/status-bar-message-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, StatusBarAlignment } from './types-impl'; import { StatusBarItem } from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/status-bar/status-bar-item.ts b/packages/plugin-ext/src/plugin/status-bar/status-bar-item.ts index bd8b55a89f05c..295b3b3a8c3da 100644 --- a/packages/plugin-ext/src/plugin/status-bar/status-bar-item.ts +++ b/packages/plugin-ext/src/plugin/status-bar/status-bar-item.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; import { ThemeColor, StatusBarAlignment } from '../types-impl'; diff --git a/packages/plugin-ext/src/plugin/stubs/tests-api.ts b/packages/plugin-ext/src/plugin/stubs/tests-api.ts index 7748b38185b65..79a896de20562 100644 --- a/packages/plugin-ext/src/plugin/stubs/tests-api.ts +++ b/packages/plugin-ext/src/plugin/stubs/tests-api.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* tslint:disable:typedef */ diff --git a/packages/plugin-ext/src/plugin/tabs.ts b/packages/plugin-ext/src/plugin/tabs.ts index 96071fcb22ae4..a1a4761632371 100644 --- a/packages/plugin-ext/src/plugin/tabs.ts +++ b/packages/plugin-ext/src/plugin/tabs.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/tasks/task-provider.ts b/packages/plugin-ext/src/plugin/tasks/task-provider.ts index ed9b42642b3be..4b533549818ca 100644 --- a/packages/plugin-ext/src/plugin/tasks/task-provider.ts +++ b/packages/plugin-ext/src/plugin/tasks/task-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/tasks/tasks.ts b/packages/plugin-ext/src/plugin/tasks/tasks.ts index 5a535579951bc..ab54e5e817e70 100644 --- a/packages/plugin-ext/src/plugin/tasks/tasks.ts +++ b/packages/plugin-ext/src/plugin/tasks/tasks.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/plugin-ext/src/plugin/telemetry-ext.ts b/packages/plugin-ext/src/plugin/telemetry-ext.ts index cd02122ff05b0..43dfb61c8c25d 100644 --- a/packages/plugin-ext/src/plugin/telemetry-ext.ts +++ b/packages/plugin-ext/src/plugin/telemetry-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 import { Event, Emitter } from '@theia/core/lib/common/event'; import { cloneAndChange } from '@theia/core'; diff --git a/packages/plugin-ext/src/plugin/terminal-ext.ts b/packages/plugin-ext/src/plugin/terminal-ext.ts index 6f439ed783ce5..f062d28b97a7c 100644 --- a/packages/plugin-ext/src/plugin/terminal-ext.ts +++ b/packages/plugin-ext/src/plugin/terminal-ext.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { UUID } from '@theia/core/shared/@phosphor/coreutils'; import { Terminal, TerminalOptions, PseudoTerminalOptions, ExtensionTerminalOptions, TerminalState } from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/text-editor.ts b/packages/plugin-ext/src/plugin/text-editor.ts index ac5af354e56fa..02852b04cf469 100644 --- a/packages/plugin-ext/src/plugin/text-editor.ts +++ b/packages/plugin-ext/src/plugin/text-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TextEditorConfiguration, TextEditorsMain, TextEditorConfigurationUpdate, SingleEditOperation } from '../common/plugin-api-rpc'; import { Range as ApiRange } from '../common/plugin-api-rpc-model'; diff --git a/packages/plugin-ext/src/plugin/text-editors.ts b/packages/plugin-ext/src/plugin/text-editors.ts index 788614fbc503a..365a56acaad18 100644 --- a/packages/plugin-ext/src/plugin/text-editors.ts +++ b/packages/plugin-ext/src/plugin/text-editors.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TextEditorsExt, EditorChangedPropertiesData, TextEditorPositionData, TextEditorsMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc'; diff --git a/packages/plugin-ext/src/plugin/theming.ts b/packages/plugin-ext/src/plugin/theming.ts index e6fbfd7baf9e6..36d251f4dd1eb 100644 --- a/packages/plugin-ext/src/plugin/theming.ts +++ b/packages/plugin-ext/src/plugin/theming.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ColorTheme, ColorThemeKind } from './types-impl'; diff --git a/packages/plugin-ext/src/plugin/timeline.ts b/packages/plugin-ext/src/plugin/timeline.ts index 324ed33e03198..384589a01fd85 100644 --- a/packages/plugin-ext/src/plugin/timeline.ts +++ b/packages/plugin-ext/src/plugin/timeline.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Plugin, PLUGIN_RPC_CONTEXT, TimelineCommandArg, TimelineExt, TimelineMain } from '../common'; import { RPCProtocol } from '../common/rpc-protocol'; diff --git a/packages/plugin-ext/src/plugin/tree/tree-views.ts b/packages/plugin-ext/src/plugin/tree/tree-views.ts index 6e60ce35ab2fb..6715ee9d6a715 100644 --- a/packages/plugin-ext/src/plugin/tree/tree-views.ts +++ b/packages/plugin-ext/src/plugin/tree/tree-views.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-ext/src/plugin/type-converters.spec.ts b/packages/plugin-ext/src/plugin/type-converters.spec.ts index 1dc99c42616e2..73c35289ef1f8 100644 --- a/packages/plugin-ext/src/plugin/type-converters.spec.ts +++ b/packages/plugin-ext/src/plugin/type-converters.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as assert from 'assert'; diff --git a/packages/plugin-ext/src/plugin/type-converters.ts b/packages/plugin-ext/src/plugin/type-converters.ts index bc194ebb4eeaa..f3c123fb0cec7 100644 --- a/packages/plugin-ext/src/plugin/type-converters.ts +++ b/packages/plugin-ext/src/plugin/type-converters.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as theia from '@theia/plugin'; diff --git a/packages/plugin-ext/src/plugin/types-impl.spec.ts b/packages/plugin-ext/src/plugin/types-impl.spec.ts index 2635bbc5b0ce3..eb4613aedc49c 100644 --- a/packages/plugin-ext/src/plugin/types-impl.spec.ts +++ b/packages/plugin-ext/src/plugin/types-impl.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isWindows } from '@theia/core'; diff --git a/packages/plugin-ext/src/plugin/types-impl.ts b/packages/plugin-ext/src/plugin/types-impl.ts index 04b38ccecfa15..4983160bbc780 100644 --- a/packages/plugin-ext/src/plugin/types-impl.ts +++ b/packages/plugin-ext/src/plugin/types-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // copied from https://github.com/microsoft/vscode/blob/1.37.0/src/vs/workbench/api/common/extHostTypes.ts /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/plugin/webview-views.ts b/packages/plugin-ext/src/plugin/webview-views.ts index dc04a658ee213..04d66415b79e3 100644 --- a/packages/plugin-ext/src/plugin/webview-views.ts +++ b/packages/plugin-ext/src/plugin/webview-views.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/plugin/webviews.ts b/packages/plugin-ext/src/plugin/webviews.ts index d6965de9aa474..c107ced1af6be 100644 --- a/packages/plugin-ext/src/plugin/webviews.ts +++ b/packages/plugin-ext/src/plugin/webviews.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { v4 } from 'uuid'; diff --git a/packages/plugin-ext/src/plugin/window-state.ts b/packages/plugin-ext/src/plugin/window-state.ts index 4a38d805369a9..160356282c8e9 100644 --- a/packages/plugin-ext/src/plugin/window-state.ts +++ b/packages/plugin-ext/src/plugin/window-state.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from './types-impl'; diff --git a/packages/plugin-ext/src/plugin/word-helper.ts b/packages/plugin-ext/src/plugin/word-helper.ts index 1231acefd05a5..a2ad55f585bce 100644 --- a/packages/plugin-ext/src/plugin/word-helper.ts +++ b/packages/plugin-ext/src/plugin/word-helper.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin-ext/src/plugin/workspace.ts b/packages/plugin-ext/src/plugin/workspace.ts index a768cf4006da9..31047f0fdab37 100644 --- a/packages/plugin-ext/src/plugin/workspace.ts +++ b/packages/plugin-ext/src/plugin/workspace.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/plugin-ext/src/typings/index.d.ts b/packages/plugin-ext/src/typings/index.d.ts index 4030d83940a28..79f281800eab5 100644 --- a/packages/plugin-ext/src/typings/index.d.ts +++ b/packages/plugin-ext/src/typings/index.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-metrics/package.json b/packages/plugin-metrics/package.json index 6332cc869595a..a83a5c1a84d07 100644 --- a/packages/plugin-metrics/package.json +++ b/packages/plugin-metrics/package.json @@ -21,7 +21,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/theia-ide/theia.git" diff --git a/packages/plugin-metrics/src/browser/plugin-metrics-creator.ts b/packages/plugin-metrics/src/browser/plugin-metrics-creator.ts index aacf994737272..b363ab3fd63b4 100644 --- a/packages/plugin-metrics/src/browser/plugin-metrics-creator.ts +++ b/packages/plugin-metrics/src/browser/plugin-metrics-creator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-metrics/src/browser/plugin-metrics-frontend-module.ts b/packages/plugin-metrics/src/browser/plugin-metrics-frontend-module.ts index 5e472a830354a..1ad7ced0f66e4 100644 --- a/packages/plugin-metrics/src/browser/plugin-metrics-frontend-module.ts +++ b/packages/plugin-metrics/src/browser/plugin-metrics-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-metrics/src/browser/plugin-metrics-languages-main.ts b/packages/plugin-metrics/src/browser/plugin-metrics-languages-main.ts index 4de0691134b40..018c4fe57d530 100644 --- a/packages/plugin-metrics/src/browser/plugin-metrics-languages-main.ts +++ b/packages/plugin-metrics/src/browser/plugin-metrics-languages-main.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CodeActionProviderDocumentation, Range, SerializedDocumentFilter, WorkspaceSymbolParams } from '@theia/plugin-ext/lib/common/plugin-api-rpc-model'; diff --git a/packages/plugin-metrics/src/browser/plugin-metrics-output-registry.ts b/packages/plugin-metrics/src/browser/plugin-metrics-output-registry.ts index 6b099b2c577b3..3653979379e96 100644 --- a/packages/plugin-metrics/src/browser/plugin-metrics-output-registry.ts +++ b/packages/plugin-metrics/src/browser/plugin-metrics-output-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-metrics/src/browser/plugin-metrics-resolver.ts b/packages/plugin-metrics/src/browser/plugin-metrics-resolver.ts index 40e9e409e40ae..f5e07753fe450 100644 --- a/packages/plugin-metrics/src/browser/plugin-metrics-resolver.ts +++ b/packages/plugin-metrics/src/browser/plugin-metrics-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin-metrics/src/common/metrics-protocol.ts b/packages/plugin-metrics/src/common/metrics-protocol.ts index 1fbcdcac9b23e..fcbc8be0c92f1 100644 --- a/packages/plugin-metrics/src/common/metrics-protocol.ts +++ b/packages/plugin-metrics/src/common/metrics-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/plugin-metrics/src/common/plugin-metrics-types.ts b/packages/plugin-metrics/src/common/plugin-metrics-types.ts index 5ebbccc9e8fab..0e582bf8fd1ff 100644 --- a/packages/plugin-metrics/src/common/plugin-metrics-types.ts +++ b/packages/plugin-metrics/src/common/plugin-metrics-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Define common interfaces that multiple classes can use diff --git a/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-count.ts b/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-count.ts index 8d7cf1ac27861..6898495819529 100644 --- a/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-count.ts +++ b/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-count.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MetricOutput, AnalyticsFromRequests } from '../../common/plugin-metrics-types'; diff --git a/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-sum.ts b/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-sum.ts index fa0f5f013b511..4e15c2856a468 100644 --- a/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-sum.ts +++ b/packages/plugin-metrics/src/node/metric-output/plugin-metrics-time-sum.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MetricOutput, AnalyticsFromRequests } from '../../common/plugin-metrics-types'; diff --git a/packages/plugin-metrics/src/node/metric-string-generator.ts b/packages/plugin-metrics/src/node/metric-string-generator.ts index 6759ff2600339..3efa371f9a2e6 100644 --- a/packages/plugin-metrics/src/node/metric-string-generator.ts +++ b/packages/plugin-metrics/src/node/metric-string-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginMetricTimeCount } from './metric-output/plugin-metrics-time-count'; import { PluginMetricTimeSum } from './metric-output/plugin-metrics-time-sum'; diff --git a/packages/plugin-metrics/src/node/metrics-contributor.spec.ts b/packages/plugin-metrics/src/node/metrics-contributor.spec.ts index c133ef56ac8aa..5da386af636d7 100644 --- a/packages/plugin-metrics/src/node/metrics-contributor.spec.ts +++ b/packages/plugin-metrics/src/node/metrics-contributor.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AnalyticsFromRequests } from '../common/plugin-metrics-types'; diff --git a/packages/plugin-metrics/src/node/metrics-contributor.ts b/packages/plugin-metrics/src/node/metrics-contributor.ts index 8aa73fcca35e8..a8eb3d87f336b 100644 --- a/packages/plugin-metrics/src/node/metrics-contributor.ts +++ b/packages/plugin-metrics/src/node/metrics-contributor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PluginMetrics } from '../common/metrics-protocol'; diff --git a/packages/plugin-metrics/src/node/plugin-metrics-backend-module.ts b/packages/plugin-metrics/src/node/plugin-metrics-backend-module.ts index fc152b29ea8a8..d07bf3558b804 100644 --- a/packages/plugin-metrics/src/node/plugin-metrics-backend-module.ts +++ b/packages/plugin-metrics/src/node/plugin-metrics-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MetricsContribution } from '@theia/metrics/lib/node/metrics-contribution'; diff --git a/packages/plugin-metrics/src/node/plugin-metrics-impl.ts b/packages/plugin-metrics/src/node/plugin-metrics-impl.ts index 71aea8ef146c0..afa3cb2e5e9aa 100644 --- a/packages/plugin-metrics/src/node/plugin-metrics-impl.ts +++ b/packages/plugin-metrics/src/node/plugin-metrics-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/plugin-metrics/src/node/plugin-metrics.ts b/packages/plugin-metrics/src/node/plugin-metrics.ts index 1eb1ece5829ae..948dcd828fc64 100644 --- a/packages/plugin-metrics/src/node/plugin-metrics.ts +++ b/packages/plugin-metrics/src/node/plugin-metrics.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 4caeaf78eb103..f78ee5b8fa674 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -6,7 +6,7 @@ "publishConfig": { "access": "public" }, - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/plugin/src/package.spec.ts b/packages/plugin/src/package.spec.ts index 2bd12c134e544..f81090f4c9157 100644 --- a/packages/plugin/src/package.spec.ts +++ b/packages/plugin/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/plugin/src/theia-extra.d.ts b/packages/plugin/src/theia-extra.d.ts index 993e7f2719863..234d2689667ce 100644 --- a/packages/plugin/src/theia-extra.d.ts +++ b/packages/plugin/src/theia-extra.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin/src/theia-proposed.d.ts b/packages/plugin/src/theia-proposed.d.ts index 85bef08d3dd7c..eedb60c36246e 100644 --- a/packages/plugin/src/theia-proposed.d.ts +++ b/packages/plugin/src/theia-proposed.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/plugin/src/theia.d.ts b/packages/plugin/src/theia.d.ts index 5ef2bc94c85eb..f7461bcb45b44 100644 --- a/packages/plugin/src/theia.d.ts +++ b/packages/plugin/src/theia.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // This file is heavily inspired by VSCode 'vscode.d.ts' - https://github.com/Microsoft/vscode/blob/master/src/vs/vscode.d.ts diff --git a/packages/plugin/src/theia.proposed.externalUriOpener.d.ts b/packages/plugin/src/theia.proposed.externalUriOpener.d.ts index 5e04f45dfeb65..c0d42d5f0ffd1 100644 --- a/packages/plugin/src/theia.proposed.externalUriOpener.d.ts +++ b/packages/plugin/src/theia.proposed.externalUriOpener.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/plugin/src/vscode.proposed.editSessionIdentityProvider.d.ts b/packages/plugin/src/vscode.proposed.editSessionIdentityProvider.d.ts index 4ca5573c1cdba..d0e8a8aa6a51d 100644 --- a/packages/plugin/src/vscode.proposed.editSessionIdentityProvider.d.ts +++ b/packages/plugin/src/vscode.proposed.editSessionIdentityProvider.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // Copied from: https://github.com/microsoft/vscode/blob/1.77.0/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts diff --git a/packages/preferences/package.json b/packages/preferences/package.json index 3bb7ac4fc1c06..1021c9f1a92c7 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -26,7 +26,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/preferences/src/browser/abstract-resource-preference-provider.spec.ts b/packages/preferences/src/browser/abstract-resource-preference-provider.spec.ts index abf531f1a5539..18b30eb865ade 100644 --- a/packages/preferences/src/browser/abstract-resource-preference-provider.spec.ts +++ b/packages/preferences/src/browser/abstract-resource-preference-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/abstract-resource-preference-provider.ts b/packages/preferences/src/browser/abstract-resource-preference-provider.ts index cae253f8a06a6..420ef6bba81a6 100644 --- a/packages/preferences/src/browser/abstract-resource-preference-provider.ts +++ b/packages/preferences/src/browser/abstract-resource-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/folder-preference-provider.ts b/packages/preferences/src/browser/folder-preference-provider.ts index d04119e286acb..0974eda6b27c0 100644 --- a/packages/preferences/src/browser/folder-preference-provider.ts +++ b/packages/preferences/src/browser/folder-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/folders-preferences-provider.ts b/packages/preferences/src/browser/folders-preferences-provider.ts index bd9c957ac42bc..ca6dd2d58aa49 100644 --- a/packages/preferences/src/browser/folders-preferences-provider.ts +++ b/packages/preferences/src/browser/folders-preferences-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/index.ts b/packages/preferences/src/browser/index.ts index 6c5c8662b8b1e..71b1f39171b9c 100644 --- a/packages/preferences/src/browser/index.ts +++ b/packages/preferences/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from '@theia/core/lib/browser/preferences'; diff --git a/packages/preferences/src/browser/monaco-jsonc-editor.ts b/packages/preferences/src/browser/monaco-jsonc-editor.ts index bd38bbf6067b6..79323e7a4d216 100644 --- a/packages/preferences/src/browser/monaco-jsonc-editor.ts +++ b/packages/preferences/src/browser/monaco-jsonc-editor.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as jsoncparser from 'jsonc-parser'; diff --git a/packages/preferences/src/browser/package.spec.ts b/packages/preferences/src/browser/package.spec.ts index 6af345d508e26..a3e797d22134e 100644 --- a/packages/preferences/src/browser/package.spec.ts +++ b/packages/preferences/src/browser/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/preferences/src/browser/preference-bindings.ts b/packages/preferences/src/browser/preference-bindings.ts index f565c594c3f21..520217edaf6f8 100644 --- a/packages/preferences/src/browser/preference-bindings.ts +++ b/packages/preferences/src/browser/preference-bindings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/preference-frontend-module.ts b/packages/preferences/src/browser/preference-frontend-module.ts index 8de3599ea8e2c..ec3c01aace7b4 100644 --- a/packages/preferences/src/browser/preference-frontend-module.ts +++ b/packages/preferences/src/browser/preference-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/preferences/src/browser/preference-open-handler.ts b/packages/preferences/src/browser/preference-open-handler.ts index 62c6686b70b9d..b8dc5ee0fb951 100644 --- a/packages/preferences/src/browser/preference-open-handler.ts +++ b/packages/preferences/src/browser/preference-open-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { animationFrame, OpenHandler } from '@theia/core/lib/browser'; diff --git a/packages/preferences/src/browser/preference-transaction-manager.ts b/packages/preferences/src/browser/preference-transaction-manager.ts index 7535aa06903bf..affac3c7a17f5 100644 --- a/packages/preferences/src/browser/preference-transaction-manager.ts +++ b/packages/preferences/src/browser/preference-transaction-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CancellationError, Emitter, Event, MaybePromise, MessageService, nls, WaitUntilEvent } from '@theia/core'; diff --git a/packages/preferences/src/browser/preference-tree-model.ts b/packages/preferences/src/browser/preference-tree-model.ts index 95202a47dab2d..c03ecf19afb96 100644 --- a/packages/preferences/src/browser/preference-tree-model.ts +++ b/packages/preferences/src/browser/preference-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/preferences-contribution.ts b/packages/preferences/src/browser/preferences-contribution.ts index e331f30cce5d0..8880955f23355 100644 --- a/packages/preferences/src/browser/preferences-contribution.ts +++ b/packages/preferences/src/browser/preferences-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, optional } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/preferences-json-schema-contribution.ts b/packages/preferences/src/browser/preferences-json-schema-contribution.ts index 914be2e29564d..036cfc9b17b28 100644 --- a/packages/preferences/src/browser/preferences-json-schema-contribution.ts +++ b/packages/preferences/src/browser/preferences-json-schema-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/preferences-monaco-contribution.ts b/packages/preferences/src/browser/preferences-monaco-contribution.ts index 950560fccfefb..ffed58796d494 100644 --- a/packages/preferences/src/browser/preferences-monaco-contribution.ts +++ b/packages/preferences/src/browser/preferences-monaco-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/preferences/src/browser/section-preference-provider.ts b/packages/preferences/src/browser/section-preference-provider.ts index af3a92133748b..59228fa708bb6 100644 --- a/packages/preferences/src/browser/section-preference-provider.ts +++ b/packages/preferences/src/browser/section-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/style/index.css b/packages/preferences/src/browser/style/index.css index 52f56ba93264d..9aa2db9ba1eab 100644 --- a/packages/preferences/src/browser/style/index.css +++ b/packages/preferences/src/browser/style/index.css @@ -11,17 +11,17 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #preferences_container_widget .p-SplitPanel-handle { - border-right: var(--theia-border-width) solid var(--theia-editorGroup-border); + border-right: var(--theia-border-width) solid var(--theia-editorGroup-border); } #preferences_container_widget .p-TabBar-tabIcon { - align-items: center; - display: flex; - line-height: var(--theia-content-line-height) !important; + align-items: center; + display: flex; + line-height: var(--theia-content-line-height) !important; } /* UI View */ @@ -33,424 +33,476 @@ @import url("./search-input.css"); .theia-settings-container { - max-width: 1000px; - padding-top: 11px; - display: grid; - grid-template-areas: - "header header" - "tabbar tabbar" - "navbar editor"; - grid-template-columns: minmax(150px, 280px) 1fr; - grid-template-rows: 45px 45px 1fr; + max-width: 1000px; + padding-top: 11px; + display: grid; + grid-template-areas: + "header header" + "tabbar tabbar" + "navbar editor"; + grid-template-columns: minmax(150px, 280px) 1fr; + grid-template-rows: 45px 45px 1fr; } -.theia-settings-container .settings-main:not(.no-results) .settings-no-results-announcement { - display: none; +.theia-settings-container + .settings-main:not(.no-results) + .settings-no-results-announcement { + display: none; } .theia-settings-container .settings-main .hidden { - display: none; + display: none; } .theia-settings-container .settings-no-results-announcement { - font-weight: bold; - font-size: var(--theia-ui-font-size3); - padding-left: var(--theia-ui-padding); - margin: calc(2*var(--theia-ui-padding)) 0px; + font-weight: bold; + font-size: var(--theia-ui-font-size3); + padding-left: var(--theia-ui-padding); + margin: calc(2 * var(--theia-ui-padding)) 0px; } .theia-settings-container .preferences-searchbar-widget { - grid-area: header; - margin: 3px 24px 0px 24px; + grid-area: header; + margin: 3px 24px 0px 24px; } .theia-settings-container .preferences-tabbar-widget { - grid-area: tabbar; - margin: 3px 24px 0px 24px; + grid-area: tabbar; + margin: 3px 24px 0px 24px; } .theia-settings-container .preferences-tabbar-widget.with-shadow { - box-shadow: 0px 6px 5px -5px var(--theia-widget-shadow); + box-shadow: 0px 6px 5px -5px var(--theia-widget-shadow); } -.theia-settings-container .preferences-tabbar-widget .preferences-scope-tab .p-TabBar-tabIcon:not(.preferences-folder-dropdown-icon) { - display: none; +.theia-settings-container + .preferences-tabbar-widget + .preferences-scope-tab + .p-TabBar-tabIcon:not(.preferences-folder-dropdown-icon) { + display: none; } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab { - background: var(--theia-editor-background); - border-right: unset; - border-bottom: var(--theia-border-width) solid var(--theia-tab-unfocusedInactiveForeground); - border-top: none; +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab { + background: var(--theia-editor-background); + border-right: unset; + border-bottom: var(--theia-border-width) solid + var(--theia-tab-unfocusedInactiveForeground); + border-top: none; } #theia-main-content-panel .theia-settings-container .tabbar-underline { - width: 100%; - position: absolute; - top: calc(var(--theia-private-horizontal-tab-height) + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2 - 1px); - border-top: 1px solid var(--theia-tab-unfocusedInactiveForeground); - z-index: -1; + width: 100%; + position: absolute; + top: calc( + var(--theia-private-horizontal-tab-height) + + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2 - 1px + ); + border-top: 1px solid var(--theia-tab-unfocusedInactiveForeground); + z-index: -1; } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab { - color: var(--theia-panelTitle-inactiveForeground); +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab { + color: var(--theia-panelTitle-inactiveForeground); } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab:hover { - color: var(--theia-panelTitle-activeForeground); +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab:hover { + color: var(--theia-panelTitle-activeForeground); } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab.p-mod-current { - color: var(--theia-panelTitle-activeForeground); - border-bottom: var(--theia-border-width) solid var(--theia-panelTitle-activeBorder); +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab.p-mod-current { + color: var(--theia-panelTitle-activeForeground); + border-bottom: var(--theia-border-width) solid + var(--theia-panelTitle-activeBorder); } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab.p-mod-current:not(.theia-mod-active) { - border-top: unset; +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab.p-mod-current:not(.theia-mod-active) { + border-top: unset; } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab.preferences-folder-tab .p-TabBar-tabLabel::after { - content: 'Folder'; - padding-left: 4px; - font-size: 0.8em; - color: var(--theia-tab-inactiveForeground); +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab.preferences-folder-tab + .p-TabBar-tabLabel::after { + content: "Folder"; + padding-left: 4px; + font-size: 0.8em; + color: var(--theia-tab-inactiveForeground); } -#theia-main-content-panel .theia-settings-container #preferences-scope-tab-bar .preferences-scope-tab.preferences-folder-dropdown { - position: relative; - padding-right: 23px; +#theia-main-content-panel + .theia-settings-container + #preferences-scope-tab-bar + .preferences-scope-tab.preferences-folder-dropdown { + position: relative; + padding-right: 23px; } .preferences-folder-dropdown-icon { - width: 15px; - height: 15px; - position: absolute; - right: var(--theia-ui-padding); + width: 15px; + height: 15px; + position: absolute; + right: var(--theia-ui-padding); } .theia-settings-container .preferences-editor-widget { - grid-area: editor; + grid-area: editor; } .theia-settings-container .preferences-editor-widget.full-pane { - grid-column-start: 1; - grid-column-end: 3; + grid-column-start: 1; + grid-column-end: 3; } .theia-settings-container .preferences-tree-widget { - grid-area: navbar; - padding-left: 31px; + grid-area: navbar; + padding-left: 31px; } .theia-settings-container .preferences-tree-widget .theia-mod-selected { - font-weight: bold; + font-weight: bold; } .theia-settings-container .preferences-tree-widget .theia-TreeNodeSegment { - text-overflow: ellipsis; - overflow: hidden; - max-width: 90%; + text-overflow: ellipsis; + overflow: hidden; + max-width: 90%; } .theia-settings-container .settings-main { - height: 100%; - width: 100%; - display: flex; - flex-direction: column; + height: 100%; + width: 100%; + display: flex; + flex-direction: column; } .theia-settings-container .settings-main-scroll-container { - position: relative; - box-sizing: border-box; - width: 100%; - padding: 0 24px; - flex: 1 1 auto; + position: relative; + box-sizing: border-box; + width: 100%; + padding: 0 24px; + flex: 1 1 auto; } .theia-settings-container .settings-main-sticky-misc { - display: flex; - align-items: center; - justify-content: space-between; - flex: 0 1 50px; + display: flex; + align-items: center; + justify-content: space-between; + flex: 0 1 50px; } -.theia-settings-container .settings-main-sticky-misc .json-button>i { - display: inline-block; - background: var(--theia-icon-open-json) no-repeat; - background-position-y: 1px; - -webkit-filter: invert(1); - filter: invert(1); - height: var(--theia-icon-size); - width: var(--theia-icon-size); +.theia-settings-container .settings-main-sticky-misc .json-button > i { + display: inline-block; + background: var(--theia-icon-open-json) no-repeat; + background-position-y: 1px; + -webkit-filter: invert(1); + filter: invert(1); + height: var(--theia-icon-size); + width: var(--theia-icon-size); } -.theia-settings-container .settings-scope>label { - margin-right: 12px; +.theia-settings-container .settings-scope > label { + margin-right: 12px; } .theia-settings-container .settings-section { - padding-left: 0; - padding-top: var(--theia-ui-padding); - margin-top: calc(var(--theia-ui-padding) * -1); + padding-left: 0; + padding-top: var(--theia-ui-padding); + margin-top: calc(var(--theia-ui-padding) * -1); } .theia-settings-container .settings-section a { - border: none; - color: var(--theia-foreground); - font-weight: 500; - outline: 0; - text-decoration: none; + border: none; + color: var(--theia-foreground); + font-weight: 500; + outline: 0; + text-decoration: none; } .theia-settings-container .settings-section a:hover { - text-decoration: underline; + text-decoration: underline; } .theia-settings-container .settings-section-category-title { - font-weight: bold; - font-size: var(--theia-ui-font-size3); - padding-left: calc(2 * var(--theia-ui-padding)); + font-weight: bold; + font-size: var(--theia-ui-font-size3); + padding-left: calc(2 * var(--theia-ui-padding)); } .theia-settings-container .settings-section-subcategory-title { - font-weight: bold; - font-size: var(--theia-ui-font-size2); - padding-left: calc(2 * var(--theia-ui-padding)); + font-weight: bold; + font-size: var(--theia-ui-font-size2); + padding-left: calc(2 * var(--theia-ui-padding)); } -.theia-settings-container .settings-section>li { - list-style-type: none; - margin: var(--theia-ui-padding) 0px; - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; - -webkit-box-align: start; - -ms-flex-align: start; - align-items: start; +.theia-settings-container .settings-section > li { + list-style-type: none; + margin: var(--theia-ui-padding) 0px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: start; } .theia-settings-container li.single-pref { - list-style-type: none; - padding: 12px 14px 18px; - width: 100%; - display: flex; - flex-direction: column; - box-sizing: border-box; - position: relative; + list-style-type: none; + padding: 12px 14px 18px; + width: 100%; + display: flex; + flex-direction: column; + box-sizing: border-box; + position: relative; } .theia-settings-container li.single-pref p { - margin: 0; + margin: 0; } .theia-settings-container li.single-pref:hover:not(:focus) { - background-color: var(--theia-settings-rowHoverBackground); + background-color: var(--theia-settings-rowHoverBackground); } .theia-settings-container li.single-pref:focus { - background-color: var(--theia-settings-focusedRowBackground); - outline: 1px solid var(--theia-settings-focusedRowBorder); + background-color: var(--theia-settings-focusedRowBackground); + outline: 1px solid var(--theia-settings-focusedRowBorder); } .theia-settings-container li.single-pref .pref-context-gutter { - position: absolute; - height: calc(100% - 36px); - left: -22px; - padding-right: 8px; - border-right: 2px hidden; + position: absolute; + height: calc(100% - 36px); + left: -22px; + padding-right: 8px; + border-right: 2px hidden; } .theia-settings-container .settings-context-menu-btn { - opacity: 0; - transition: opacity .5s; -} - -.theia-settings-container .single-pref:focus-within .pref-context-gutter .settings-context-menu-btn, -.theia-settings-container .pref-name:hover+.pref-context-gutter .settings-context-menu-btn, + opacity: 0; + transition: opacity 0.5s; +} + +.theia-settings-container + .single-pref:focus-within + .pref-context-gutter + .settings-context-menu-btn, +.theia-settings-container + .pref-name:hover + + .pref-context-gutter + .settings-context-menu-btn, .theia-settings-container .pref-context-gutter:hover .settings-context-menu-btn, -.theia-settings-container .pref-context-gutter.show-cog .settings-context-menu-btn { - opacity: 1; +.theia-settings-container + .pref-context-gutter.show-cog + .settings-context-menu-btn { + opacity: 1; } -.theia-settings-container li.single-pref .pref-context-gutter.theia-mod-item-modified { - border-right: 2px solid var(--theia-settings-modifiedItemIndicator); +.theia-settings-container + li.single-pref + .pref-context-gutter.theia-mod-item-modified { + border-right: 2px solid var(--theia-settings-modifiedItemIndicator); } .theia-settings-container li.single-pref input[type="text"] { - -webkit-box-sizing: border-box; - box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } .theia-settings-container .settings-main { - margin: 0; + margin: 0; } .theia-settings-container .settings-main-sticky { - top: 0; - padding-top: calc(var(--theia-ui-padding)); - margin-top: calc(var(--theia-ui-padding) * -1); - background-color: var(--theia-editor-background); - -webkit-box-sizing: border-box; - box-sizing: border-box; - z-index: 1000; - display: flex; - flex-direction: column; - justify-content: space-around; + top: 0; + padding-top: calc(var(--theia-ui-padding)); + margin-top: calc(var(--theia-ui-padding) * -1); + background-color: var(--theia-editor-background); + -webkit-box-sizing: border-box; + box-sizing: border-box; + z-index: 1000; + display: flex; + flex-direction: column; + justify-content: space-around; } .theia-settings-container .pref-name { - padding: 0; - font-weight: bold; + padding: 0; + font-weight: bold; } .theia-settings-container .preference-leaf-headline-prefix { - color: var(--theia-descriptionForeground); + color: var(--theia-descriptionForeground); } .preferences-tree-spacer { - padding-left: calc(var(--theia-ui-padding)/2); - padding-right: calc(var(--theia-ui-padding)/2); - min-width: var(--theia-icon-size); - min-height: var(--theia-icon-size); + padding-left: calc(var(--theia-ui-padding) / 2); + padding-right: calc(var(--theia-ui-padding) / 2); + min-width: var(--theia-icon-size); + min-height: var(--theia-icon-size); } .theia-settings-container .pref-description { - padding: var(--theia-ui-padding) 0; - color: var(--theia-descriptionForeground); - line-height: 18px; + padding: var(--theia-ui-padding) 0; + color: var(--theia-descriptionForeground); + line-height: 18px; } .theia-settings-container .pref-description a { - text-decoration-line: none; - cursor: pointer; + text-decoration-line: none; + cursor: pointer; } .theia-settings-container .theia-select:focus { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1 !important; - outline-color: var(--theia-focusBorder); + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + opacity: 1 !important; + outline-color: var(--theia-focusBorder); } .theia-settings-container .theia-input[type="text"] { - border: 1px solid var(--theia-dropdown-border); + border: 1px solid var(--theia-dropdown-border); } .theia-settings-container .theia-input[type="checkbox"]:focus, .theia-settings-container .theia-input[type="number"]:focus { - outline-width: 2px; + outline-width: 2px; } .theia-settings-container .theia-input[type="checkbox"] { - margin-left: 0; + margin-left: 0; } /* Remove the spinners from input[type = number] on Firefox. */ .theia-settings-container .theia-input[type="number"] { - -webkit-appearance: textfield; - border: 1px solid var(--theia-dropdown-border); + -webkit-appearance: textfield; + border: 1px solid var(--theia-dropdown-border); } /* Remove the webkit spinners from input[type = number] on all browsers except Firefox. */ .theia-settings-container input::-webkit-outer-spin-button, .theia-settings-container input::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; + -webkit-appearance: none; + margin: 0; } -.theia-settings-container .pref-content-container .pref-input .pref-input-container .pref-error-notification { - border-style: solid; - border-color: var(--theia-inputValidation-errorBorder); - background-color: var(--theia-inputValidation-errorBackground); - width: 100%; - box-sizing: border-box; - padding: var(--theia-ui-padding); +.theia-settings-container + .pref-content-container + .pref-input + .pref-input-container + .pref-error-notification { + border-style: solid; + border-color: var(--theia-inputValidation-errorBorder); + background-color: var(--theia-inputValidation-errorBackground); + width: 100%; + box-sizing: border-box; + padding: var(--theia-ui-padding); } -.theia-settings-container .pref-content-container .pref-input .pref-input-container { - display: flex; - flex-direction: column; +.theia-settings-container + .pref-content-container + .pref-input + .pref-input-container { + display: flex; + flex-direction: column; } .theia-settings-container .pref-content-container a.theia-json-input { - text-decoration: underline; - color: var(--theia-titleBar-activeForeground) + text-decoration: underline; + color: var(--theia-titleBar-activeForeground); } .theia-settings-container .pref-content-container a.theia-json-input:hover { - text-decoration: none; - cursor: pointer; + text-decoration: none; + cursor: pointer; } .theia-settings-container .pref-content-container { - width: 100%; + width: 100%; } .theia-settings-container .pref-content-container .pref-input { - padding: var(--theia-ui-padding) 0; - width: 100%; - max-width: 320px; + padding: var(--theia-ui-padding) 0; + width: 100%; + max-width: 320px; } -.theia-settings-container .pref-content-container .pref-input>select, -.theia-settings-container .pref-content-container .pref-input>input:not([type="checkbox"]) { - width: 100%; +.theia-settings-container .pref-content-container .pref-input > select, +.theia-settings-container + .pref-content-container + .pref-input + > input:not([type="checkbox"]) { + width: 100%; } - /* These specifications for the boolean class ensure that the checkbox is rendered to the left of the description. */ .theia-settings-container .pref-content-container.boolean { - display: grid; - grid-template-columns: 20px 1fr; + display: grid; + grid-template-columns: 20px 1fr; } .theia-settings-container .pref-content-container.boolean .pref-description { - grid-column-start: 2; - grid-row-start: 1; + grid-column-start: 2; + grid-row-start: 1; } .theia-settings-container .pref-content-container.boolean .pref-input { - grid-column-start: 1; - grid-row-start: 1; - margin: 0; + grid-column-start: 1; + grid-row-start: 1; + margin: 0; } -.theia-settings-container .settings-section>li:last-child { - margin-bottom: 20px; +.theia-settings-container .settings-section > li:last-child { + margin-bottom: 20px; } .theia-settings-container .preference-leaf-headline-suffix { - font-weight: normal; - color: var(--theia-descriptionForeground); + font-weight: normal; + color: var(--theia-descriptionForeground); } .theia-settings-container .preference-leaf-headline-suffix::before { - content: ' ('; + content: " ("; } .theia-settings-container .preference-leaf-headline-suffix::after { - content: ')'; + content: ")"; } .theia-settings-container .preference-scope-underlined { - text-decoration: underline; - cursor: pointer; + text-decoration: underline; + cursor: pointer; } -.theia-settings-container .preference-modified-scope-wrapper:not(:last-child)::after { - content: ', '; +.theia-settings-container + .preference-modified-scope-wrapper:not(:last-child)::after { + content: ", "; } /** Select component */ .theia-settings-container .theia-select-component { - height: 26px; - width: 100%; - max-width: 320px; + height: 26px; + width: 100%; + max-width: 320px; } diff --git a/packages/preferences/src/browser/style/preference-array.css b/packages/preferences/src/browser/style/preference-array.css index 52c8b30e8d658..a37de0164981c 100644 --- a/packages/preferences/src/browser/style/preference-array.css +++ b/packages/preferences/src/browser/style/preference-array.css @@ -11,26 +11,26 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-settings-container .preference-array { list-style: none; - padding : 0; + padding: 0; } .theia-settings-container .preference-array-element { - display : -webkit-box; - display : -ms-flexbox; - display : flex; - -webkit-box-pack : justify; - -ms-flex-pack : justify; - justify-content : space-between; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; -webkit-box-align: center; - -ms-flex-align : center; - align-items : center; - padding : calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding); - border-bottom : var(--theia-panel-border) 2px solid; + -ms-flex-align: center; + align-items: center; + padding: calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding); + border-bottom: var(--theia-panel-border) 2px solid; } .theia-settings-container .pref-input li:nth-last-child(2) { @@ -38,12 +38,12 @@ } .theia-settings-container .pref-input li:last-child { - display : -webkit-box; - display : -ms-flexbox; - display : flex; + display: -webkit-box; + display: -ms-flexbox; + display: flex; -webkit-box-align: center; - -ms-flex-align : center; - align-items : center; + -ms-flex-align: center; + align-items: center; } .theia-settings-container .preference-array-element:hover { @@ -51,40 +51,44 @@ } .theia-settings-container .preference-array-element-btn { - width : 1.5em; - height : 1.5em; - display : -webkit-box; - display : -ms-flexbox; - display : flex; - -webkit-box-pack : center; - -ms-flex-pack : center; - justify-content : center; + width: 1.5em; + height: 1.5em; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; -webkit-box-align: center; - -ms-flex-align : center; - align-items : center; + -ms-flex-align: center; + align-items: center; } -.theia-settings-container .preference-array-element .preference-array-element-btn { +.theia-settings-container + .preference-array-element + .preference-array-element-btn { opacity: 0; } -.theia-settings-container .preference-array-element:hover .preference-array-element-btn { +.theia-settings-container + .preference-array-element:hover + .preference-array-element-btn { opacity: 1; } .theia-settings-container .preference-array-element-btn:hover { background-color: rgba(50%, 50%, 50%, 0.1); - cursor : pointer; + cursor: pointer; } .theia-settings-container .preference-array .codicon.codicon-add { - margin-left : calc((var(--theia-icon-size) + 4px) * -1); + margin-left: calc((var(--theia-icon-size) + 4px) * -1); margin-right: 4px; - width : var(--theia-icon-size); - height : var(--theia-icon-size); + width: var(--theia-icon-size); + height: var(--theia-icon-size); } .theia-settings-container .preference-array-input { padding-right: calc(var(--theia-icon-size) + var(--theia-ui-padding)); - width : 100%; + width: 100%; } diff --git a/packages/preferences/src/browser/style/preference-context-menu.css b/packages/preferences/src/browser/style/preference-context-menu.css index ab58ab6c0c3a1..11f34e9a0c730 100644 --- a/packages/preferences/src/browser/style/preference-context-menu.css +++ b/packages/preferences/src/browser/style/preference-context-menu.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-settings-container .settings-context-menu-container { diff --git a/packages/preferences/src/browser/style/preference-file.css b/packages/preferences/src/browser/style/preference-file.css index 96783311fd4dc..820efcedbcc87 100644 --- a/packages/preferences/src/browser/style/preference-file.css +++ b/packages/preferences/src/browser/style/preference-file.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-settings-container .preference-file-container { diff --git a/packages/preferences/src/browser/style/preference-object.css b/packages/preferences/src/browser/style/preference-object.css index db5ac76c3a682..5195857ee10a4 100644 --- a/packages/preferences/src/browser/style/preference-object.css +++ b/packages/preferences/src/browser/style/preference-object.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-settings-container .object-preference-input-container { diff --git a/packages/preferences/src/browser/style/search-input.css b/packages/preferences/src/browser/style/search-input.css index 2a2aa906876cc..2c7215214e6ee 100644 --- a/packages/preferences/src/browser/style/search-input.css +++ b/packages/preferences/src/browser/style/search-input.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-settings-container .settings-search-container { @@ -62,5 +62,5 @@ } .theia-settings-container .settings-search-container .enabled { - opacity: 1.0; + opacity: 1; } diff --git a/packages/preferences/src/browser/user-configs-preference-provider.ts b/packages/preferences/src/browser/user-configs-preference-provider.ts index 966255be5829f..c3fba02dbe87c 100644 --- a/packages/preferences/src/browser/user-configs-preference-provider.ts +++ b/packages/preferences/src/browser/user-configs-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/user-preference-provider.ts b/packages/preferences/src/browser/user-preference-provider.ts index 71f350c9eaf83..b356e0324349d 100644 --- a/packages/preferences/src/browser/user-preference-provider.ts +++ b/packages/preferences/src/browser/user-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/util/preference-scope-command-manager.ts b/packages/preferences/src/browser/util/preference-scope-command-manager.ts index 6de351f9625df..3ed7056512d73 100644 --- a/packages/preferences/src/browser/util/preference-scope-command-manager.ts +++ b/packages/preferences/src/browser/util/preference-scope-command-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/util/preference-tree-generator.ts b/packages/preferences/src/browser/util/preference-tree-generator.ts index a0e4e56d51075..e8e1bb6d09c09 100644 --- a/packages/preferences/src/browser/util/preference-tree-generator.ts +++ b/packages/preferences/src/browser/util/preference-tree-generator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/util/preference-tree-label-provider.spec.ts b/packages/preferences/src/browser/util/preference-tree-label-provider.spec.ts index cfada687466cf..06b764580b449 100644 --- a/packages/preferences/src/browser/util/preference-tree-label-provider.spec.ts +++ b/packages/preferences/src/browser/util/preference-tree-label-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/util/preference-tree-label-provider.ts b/packages/preferences/src/browser/util/preference-tree-label-provider.ts index 69b64a1e3a4bb..671bed7be7565 100644 --- a/packages/preferences/src/browser/util/preference-tree-label-provider.ts +++ b/packages/preferences/src/browser/util/preference-tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/util/preference-types.ts b/packages/preferences/src/browser/util/preference-types.ts index 5f0e0ff703896..c901c87a3ae85 100644 --- a/packages/preferences/src/browser/util/preference-types.ts +++ b/packages/preferences/src/browser/util/preference-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/preferences/src/browser/views/components/preference-array-input.ts b/packages/preferences/src/browser/views/components/preference-array-input.ts index 97f1c137bc24e..242a1b173611c 100644 --- a/packages/preferences/src/browser/views/components/preference-array-input.ts +++ b/packages/preferences/src/browser/views/components/preference-array-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codiconArray } from '@theia/core/lib/browser'; diff --git a/packages/preferences/src/browser/views/components/preference-boolean-input.ts b/packages/preferences/src/browser/views/components/preference-boolean-input.ts index 1477eac6cf465..7bef3fa84529b 100644 --- a/packages/preferences/src/browser/views/components/preference-boolean-input.ts +++ b/packages/preferences/src/browser/views/components/preference-boolean-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/views/components/preference-file-input.ts b/packages/preferences/src/browser/views/components/preference-file-input.ts index 9caff14622440..07e0776bd5033 100644 --- a/packages/preferences/src/browser/views/components/preference-file-input.ts +++ b/packages/preferences/src/browser/views/components/preference-file-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isObject } from '@theia/core/lib/common'; diff --git a/packages/preferences/src/browser/views/components/preference-json-input.ts b/packages/preferences/src/browser/views/components/preference-json-input.ts index 237deff0af7d5..4839100b93155 100644 --- a/packages/preferences/src/browser/views/components/preference-json-input.ts +++ b/packages/preferences/src/browser/views/components/preference-json-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer'; diff --git a/packages/preferences/src/browser/views/components/preference-node-renderer-creator.ts b/packages/preferences/src/browser/views/components/preference-node-renderer-creator.ts index 480c53f4be3e2..7bb68f6ee2a11 100644 --- a/packages/preferences/src/browser/views/components/preference-node-renderer-creator.ts +++ b/packages/preferences/src/browser/views/components/preference-node-renderer-creator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContributionProvider, Disposable, Emitter, Event, Prioritizeable } from '@theia/core'; diff --git a/packages/preferences/src/browser/views/components/preference-node-renderer.ts b/packages/preferences/src/browser/views/components/preference-node-renderer.ts index 2b3161df1b08e..b034b8a477955 100644 --- a/packages/preferences/src/browser/views/components/preference-node-renderer.ts +++ b/packages/preferences/src/browser/views/components/preference-node-renderer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/views/components/preference-number-input.ts b/packages/preferences/src/browser/views/components/preference-number-input.ts index 46fb9299501eb..d4d26820269e3 100644 --- a/packages/preferences/src/browser/views/components/preference-number-input.ts +++ b/packages/preferences/src/browser/views/components/preference-number-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/preferences/src/browser/views/components/preference-select-input.ts b/packages/preferences/src/browser/views/components/preference-select-input.ts index a24cb2d5cac5f..62e7cf8291754 100644 --- a/packages/preferences/src/browser/views/components/preference-select-input.ts +++ b/packages/preferences/src/browser/views/components/preference-select-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { PreferenceLeafNodeRenderer, PreferenceNodeRenderer } from './preference-node-renderer'; diff --git a/packages/preferences/src/browser/views/components/preference-string-input.ts b/packages/preferences/src/browser/views/components/preference-string-input.ts index 80bd3b895ea2f..6ea87640f4bcc 100644 --- a/packages/preferences/src/browser/views/components/preference-string-input.ts +++ b/packages/preferences/src/browser/views/components/preference-string-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/views/preference-editor-widget.ts b/packages/preferences/src/browser/views/preference-editor-widget.ts index 46458a0dd9896..4d2e06ea70568 100644 --- a/packages/preferences/src/browser/views/preference-editor-widget.ts +++ b/packages/preferences/src/browser/views/preference-editor-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preferences/src/browser/views/preference-scope-tabbar-widget.tsx b/packages/preferences/src/browser/views/preference-scope-tabbar-widget.tsx index 90f85dba2a6e4..34744ec87de61 100644 --- a/packages/preferences/src/browser/views/preference-scope-tabbar-widget.tsx +++ b/packages/preferences/src/browser/views/preference-scope-tabbar-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/views/preference-searchbar-widget.tsx b/packages/preferences/src/browser/views/preference-searchbar-widget.tsx index f3544226cf3cb..3ca41abd9a61d 100644 --- a/packages/preferences/src/browser/views/preference-searchbar-widget.tsx +++ b/packages/preferences/src/browser/views/preference-searchbar-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codicon, ReactWidget, StatefulWidget, Widget } from '@theia/core/lib/browser'; diff --git a/packages/preferences/src/browser/views/preference-tree-widget.tsx b/packages/preferences/src/browser/views/preference-tree-widget.tsx index ddb7d1002566f..29a94d1875b90 100644 --- a/packages/preferences/src/browser/views/preference-tree-widget.tsx +++ b/packages/preferences/src/browser/views/preference-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/views/preference-widget-bindings.ts b/packages/preferences/src/browser/views/preference-widget-bindings.ts index 677122e046480..a2369163124e4 100644 --- a/packages/preferences/src/browser/views/preference-widget-bindings.ts +++ b/packages/preferences/src/browser/views/preference-widget-bindings.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { createTreeContainer, LabelProviderContribution, WidgetFactory } from '@theia/core/lib/browser'; import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider'; diff --git a/packages/preferences/src/browser/views/preference-widget.tsx b/packages/preferences/src/browser/views/preference-widget.tsx index d88a92ee37a25..2256fec5737e9 100644 --- a/packages/preferences/src/browser/views/preference-widget.tsx +++ b/packages/preferences/src/browser/views/preference-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { postConstruct, injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/workspace-file-preference-provider.ts b/packages/preferences/src/browser/workspace-file-preference-provider.ts index e3675b01d7407..01765f35d55c6 100644 --- a/packages/preferences/src/browser/workspace-file-preference-provider.ts +++ b/packages/preferences/src/browser/workspace-file-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/preferences/src/browser/workspace-preference-provider.ts b/packages/preferences/src/browser/workspace-preference-provider.ts index e29d115d4bb42..a5ed22c1e5c5c 100644 --- a/packages/preferences/src/browser/workspace-preference-provider.ts +++ b/packages/preferences/src/browser/workspace-preference-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/preview/package.json b/packages/preview/package.json index acbe82af88f67..ba9c4784dcdac 100644 --- a/packages/preview/package.json +++ b/packages/preview/package.json @@ -23,7 +23,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/preview/src/browser/index.ts b/packages/preview/src/browser/index.ts index fd2d02e26dfcf..f956ca5622cc5 100644 --- a/packages/preview/src/browser/index.ts +++ b/packages/preview/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './preview-uri'; diff --git a/packages/preview/src/browser/markdown/index.ts b/packages/preview/src/browser/markdown/index.ts index 503107ae46065..ef97b63d4635b 100644 --- a/packages/preview/src/browser/markdown/index.ts +++ b/packages/preview/src/browser/markdown/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './markdown-preview-handler'; diff --git a/packages/preview/src/browser/markdown/markdown-preview-handler.spec.ts b/packages/preview/src/browser/markdown/markdown-preview-handler.spec.ts index dc9d9f6f7403b..372541695eb74 100644 --- a/packages/preview/src/browser/markdown/markdown-preview-handler.spec.ts +++ b/packages/preview/src/browser/markdown/markdown-preview-handler.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable no-unsanitized/property */ diff --git a/packages/preview/src/browser/markdown/markdown-preview-handler.ts b/packages/preview/src/browser/markdown/markdown-preview-handler.ts index cc85c1d188a63..dd806e0532bf3 100644 --- a/packages/preview/src/browser/markdown/markdown-preview-handler.ts +++ b/packages/preview/src/browser/markdown/markdown-preview-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/markdown/style/index.css b/packages/preview/src/browser/markdown/style/index.css index 30fda2df7a104..dc5bdbc16396b 100644 --- a/packages/preview/src/browser/markdown/style/index.css +++ b/packages/preview/src/browser/markdown/style/index.css @@ -11,8 +11,8 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import './markdown.css'; -@import './tomorrow.css'; +@import "./markdown.css"; +@import "./tomorrow.css"; diff --git a/packages/preview/src/browser/markdown/style/markdown.css b/packages/preview/src/browser/markdown/style/markdown.css index 6bae2da9624d5..93cb5e1d06b60 100644 --- a/packages/preview/src/browser/markdown/style/markdown.css +++ b/packages/preview/src/browser/markdown/style/markdown.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /*--------------------------------------------------------------------------------------------- @@ -20,79 +20,81 @@ *--------------------------------------------------------------------------------------------*/ .markdown-preview { - font-family: var(--theia-ui-font-family); - font-size: 14px; - padding: 0 26px; - line-height: var(--theia-content-line-height); - word-wrap: break-word; + font-family: var(--theia-ui-font-family); + font-size: 14px; + padding: 0 26px; + line-height: var(--theia-content-line-height); + word-wrap: break-word; } .markdown-preview:focus { - outline: 0; - box-shadow: none; + outline: 0; + box-shadow: none; } .markdown-preview .line { - position: relative; + position: relative; } .markdown-preview .line:hover:before { - content: ""; - display: block; - position: absolute; - top: 0; - left: -12px; - height: 100%; + content: ""; + display: block; + position: absolute; + top: 0; + left: -12px; + height: 100%; } .markdown-preview li.line:hover:before { - left: -30px; + left: -30px; } .markdown-preview .line:hover:before { - border-left: 3px solid var(--theia-editor-foreground); + border-left: 3px solid var(--theia-editor-foreground); } .markdown-preview .line .line:hover:before { - border-left: none; + border-left: none; } .markdown-preview img { - max-width: 100%; - max-height: 100%; + max-width: 100%; + max-height: 100%; } .markdown-preview a { - text-decoration: none; + text-decoration: none; } .markdown-preview a:hover { - text-decoration: underline; + text-decoration: underline; } .markdown-preview a:focus, .markdown-preview input:focus, .markdown-preview select:focus, .markdown-preview textarea:focus { - outline: 1px solid -webkit-focus-ring-color; - outline-offset: -1px; + outline: 1px solid -webkit-focus-ring-color; + outline-offset: -1px; } .markdown-preview hr { - border: 0; - height: 2px; - border-bottom: 2px solid; + border: 0; + height: 2px; + border-bottom: 2px solid; } .markdown-preview h1 { - padding-bottom: 0.3em; - line-height: 1.2; - border-bottom-width: 1px; - border-bottom-style: solid; + padding-bottom: 0.3em; + line-height: 1.2; + border-bottom-width: 1px; + border-bottom-style: solid; } -.markdown-preview h1, h2, h3 { - font-weight: normal; +.markdown-preview h1, +h2, +h3 { + font-weight: normal; } .markdown-preview h1 code, @@ -101,101 +103,101 @@ .markdown-preview h4 code, .markdown-preview h5 code, .markdown-preview h6 code { - font-size: inherit; - line-height: auto; + font-size: inherit; + line-height: auto; } .markdown-preview table { - border-collapse: collapse; + border-collapse: collapse; } .markdown-preview table > thead > tr > th { - text-align: left; - border-bottom: 1px solid; - border-color: rgba(255, 255, 255, 0.69); + text-align: left; + border-bottom: 1px solid; + border-color: rgba(255, 255, 255, 0.69); } .theia-light .markdown-preview table > thead > tr > th { - border-color: rgba(0, 0, 0, 0.69); + border-color: rgba(0, 0, 0, 0.69); } .markdown-preview table > thead > tr > th, .markdown-preview table > thead > tr > td, .markdown-preview table > tbody > tr > th, .markdown-preview table > tbody > tr > td { - padding: 5px 10px; + padding: 5px 10px; } .markdown-preview table > tbody > tr + tr > td { - border-top: 1px solid; + border-top: 1px solid; } .markdown-preview blockquote { - margin: 0 7px 0 5px; - padding: 0 16px 0 10px; - border-left: 5px solid; - background: var(--theia-textBlockQuote-background); - border-color: var(--theia-textBlockQuote-border); + margin: 0 7px 0 5px; + padding: 0 16px 0 10px; + border-left: 5px solid; + background: var(--theia-textBlockQuote-background); + border-color: var(--theia-textBlockQuote-border); } .markdown-preview code { - font-family: var(--theia-code-font-family); - font-size: var(--theia-code-font-size); - line-height: var(--theia-code-line-height); - color: var(--md-orange-800); + font-family: var(--theia-code-font-family); + font-size: var(--theia-code-font-size); + line-height: var(--theia-code-line-height); + color: var(--md-orange-800); } .markdown-preview.wordWrap pre { - white-space: pre-wrap; + white-space: pre-wrap; } .markdown-preview pre:not(.hljs), .markdown-preview pre.hljs code > div { - padding: 16px; - border-radius: 3px; - overflow: auto; + padding: 16px; + border-radius: 3px; + overflow: auto; } .markdown-preview, .markdown-preview pre code { - color: var(--theia-editor-foreground); - tab-size: 4; + color: var(--theia-editor-foreground); + tab-size: 4; } /** Theming */ .theia-light .markdown-preview pre { - background-color: rgba(220, 220, 220, 0.4); + background-color: rgba(220, 220, 220, 0.4); } .theia-dark .markdown-preview pre { - background-color: rgba(10, 10, 10, 0.4); + background-color: rgba(10, 10, 10, 0.4); } .theia-high-contrast .markdown-preview pre { - background-color: rgb(0, 0, 0); + background-color: rgb(0, 0, 0); } .vscode-high-contrast .markdown-preview h1 { - border-color: rgb(0, 0, 0); + border-color: rgb(0, 0, 0); } .theia-light .markdown-preview table > thead > tr > th { - border-color: rgba(0, 0, 0, 0.69); + border-color: rgba(0, 0, 0, 0.69); } .theia-dark .markdown-preview table > thead > tr > th { - border-color: rgba(255, 255, 255, 0.69); + border-color: rgba(255, 255, 255, 0.69); } .theia-light .markdown-preview h1, .theia-light .markdown-preview hr, .theia-light .markdown-preview table > tbody > tr + tr > td { - border-color: rgba(0, 0, 0, 0.18); + border-color: rgba(0, 0, 0, 0.18); } .theia-dark .markdown-preview h1, .theia-dark .markdown-preview hr, .theia-dark .markdown-preview table > tbody > tr + tr > td { - border-color: rgba(255, 255, 255, 0.18); + border-color: rgba(255, 255, 255, 0.18); } diff --git a/packages/preview/src/browser/markdown/style/tomorrow.css b/packages/preview/src/browser/markdown/style/tomorrow.css index 04199929b0c71..55d01a70c203d 100644 --- a/packages/preview/src/browser/markdown/style/tomorrow.css +++ b/packages/preview/src/browser/markdown/style/tomorrow.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ /* Tomorrow Theme */ @@ -37,7 +37,7 @@ /* Tomorrow Comment */ .theia-preview-widget .hljs-comment, .theia-preview-widget .hljs-quote { - color: #8e908c; + color: #8e908c; } /* Tomorrow Red */ @@ -49,7 +49,7 @@ .theia-preview-widget .hljs-selector-class, .theia-preview-widget .hljs-regexp, .theia-preview-widget .hljs-deletion { - color: #c82829; + color: #c82829; } /* Tomorrow Orange */ @@ -61,12 +61,12 @@ .theia-preview-widget .hljs-params, .theia-preview-widget .hljs-meta, .theia-preview-widget .hljs-link { - color: #f5871f; + color: #f5871f; } /* Tomorrow Yellow */ .theia-preview-widget .hljs-attribute { - color: #eab700; + color: #eab700; } /* Tomorrow Green */ @@ -74,32 +74,32 @@ .theia-preview-widget .hljs-symbol, .theia-preview-widget .hljs-bullet, .theia-preview-widget .hljs-addition { - color: #718c00; + color: #718c00; } /* Tomorrow Blue */ .theia-preview-widget .hljs-title, .theia-preview-widget .hljs-section { - color: #4271ae; + color: #4271ae; } /* Tomorrow Purple */ .theia-preview-widget .hljs-keyword, .theia-preview-widget .hljs-selector-tag { - color: #8959a8; + color: #8959a8; } .theia-preview-widget .hljs { - display: block; - overflow-x: auto; - color: #4d4d4c; - padding: 0.5em; + display: block; + overflow-x: auto; + color: #4d4d4c; + padding: 0.5em; } .theia-preview-widget .hljs-emphasis { - font-style: italic; + font-style: italic; } .theia-preview-widget .hljs-strong { - font-weight: bold; + font-weight: bold; } diff --git a/packages/preview/src/browser/preview-contribution.ts b/packages/preview/src/browser/preview-contribution.ts index 181102a107f65..18f105327ba91 100644 --- a/packages/preview/src/browser/preview-contribution.ts +++ b/packages/preview/src/browser/preview-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/preview-frontend-module.ts b/packages/preview/src/browser/preview-frontend-module.ts index 48b8839677295..5fba066f72c30 100644 --- a/packages/preview/src/browser/preview-frontend-module.ts +++ b/packages/preview/src/browser/preview-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/preview-handler.ts b/packages/preview/src/browser/preview-handler.ts index 367516b53aa08..d63e6e05face7 100644 --- a/packages/preview/src/browser/preview-handler.ts +++ b/packages/preview/src/browser/preview-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/preview-link-normalizer.ts b/packages/preview/src/browser/preview-link-normalizer.ts index f06ce32158b52..0a7a704b1fae0 100644 --- a/packages/preview/src/browser/preview-link-normalizer.ts +++ b/packages/preview/src/browser/preview-link-normalizer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/preview-preferences.ts b/packages/preview/src/browser/preview-preferences.ts index 8d62fe43d7f02..b34d955d7b171 100644 --- a/packages/preview/src/browser/preview-preferences.ts +++ b/packages/preview/src/browser/preview-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/preview/src/browser/preview-uri.ts b/packages/preview/src/browser/preview-uri.ts index 99e26ee9c9d1e..7700614e52262 100644 --- a/packages/preview/src/browser/preview-uri.ts +++ b/packages/preview/src/browser/preview-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/preview/src/browser/preview-widget.ts b/packages/preview/src/browser/preview-widget.ts index 30729f0e9b015..0382d1bc309de 100644 --- a/packages/preview/src/browser/preview-widget.ts +++ b/packages/preview/src/browser/preview-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import throttle = require('@theia/core/shared/lodash.throttle'); diff --git a/packages/preview/src/browser/style/index.css b/packages/preview/src/browser/style/index.css index 0ebfb15a08c0c..a5f1349156582 100644 --- a/packages/preview/src/browser/style/index.css +++ b/packages/preview/src/browser/style/index.css @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import './preview-widget.css'; +@import "./preview-widget.css"; diff --git a/packages/preview/src/browser/style/preview-widget.css b/packages/preview/src/browser/style/preview-widget.css index abe30a37a4748..89beaf74b0e0b 100644 --- a/packages/preview/src/browser/style/preview-widget.css +++ b/packages/preview/src/browser/style/preview-widget.css @@ -11,19 +11,19 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-preview-widget { - overflow-y: auto; - overflow-x: hidden; + overflow-y: auto; + overflow-x: hidden; } .theia-preview-widget .scrollBeyondLastLine { - margin-bottom: calc(100vh - var(--theia-content-line-height)); + margin-bottom: calc(100vh - var(--theia-content-line-height)); } .theia-preview-widget:focus { - outline: 0; - box-shadow: none; + outline: 0; + box-shadow: none; } diff --git a/packages/preview/src/package.spec.ts b/packages/preview/src/package.spec.ts index c6ab0e6229233..d15c6fa10272f 100644 --- a/packages/preview/src/package.spec.ts +++ b/packages/preview/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/process/package.json b/packages/process/package.json index 3e36dba5e31e6..c20aab5ead24c 100644 --- a/packages/process/package.json +++ b/packages/process/package.json @@ -22,7 +22,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/process/src/common/process-common-module.ts b/packages/process/src/common/process-common-module.ts index d658af6c2a3f9..e8cc1432599ee 100644 --- a/packages/process/src/common/process-common-module.ts +++ b/packages/process/src/common/process-common-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/common/process-manager-types.ts b/packages/process/src/common/process-manager-types.ts index 3dd9fd470ecb4..01653487f8e6b 100644 --- a/packages/process/src/common/process-manager-types.ts +++ b/packages/process/src/common/process-manager-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event } from '@theia/core'; diff --git a/packages/process/src/common/shell-command-builder.slow-spec.ts b/packages/process/src/common/shell-command-builder.slow-spec.ts index 1b09b9ff7022a..d06fe44b81040 100644 --- a/packages/process/src/common/shell-command-builder.slow-spec.ts +++ b/packages/process/src/common/shell-command-builder.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/process/src/common/shell-command-builder.ts b/packages/process/src/common/shell-command-builder.ts index 006821e66ac4c..289ba4862d6b1 100644 --- a/packages/process/src/common/shell-command-builder.ts +++ b/packages/process/src/common/shell-command-builder.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/process/src/common/shell-quoting.spec.ts b/packages/process/src/common/shell-quoting.spec.ts index 16a4bde9a0c04..64b7f8d092ad4 100644 --- a/packages/process/src/common/shell-quoting.spec.ts +++ b/packages/process/src/common/shell-quoting.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/process/src/common/shell-quoting.ts b/packages/process/src/common/shell-quoting.ts index 8ad44ec20eae8..8fb680da73cf9 100644 --- a/packages/process/src/common/shell-quoting.ts +++ b/packages/process/src/common/shell-quoting.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // #region vscode diff --git a/packages/process/src/node/dev-null-stream.ts b/packages/process/src/node/dev-null-stream.ts index e44fce1264d85..65b4a4e950cf2 100644 --- a/packages/process/src/node/dev-null-stream.ts +++ b/packages/process/src/node/dev-null-stream.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import stream = require('stream'); diff --git a/packages/process/src/node/index.ts b/packages/process/src/node/index.ts index 30b3f4611e4cc..1369bf00a92a7 100644 --- a/packages/process/src/node/index.ts +++ b/packages/process/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './process-manager'; diff --git a/packages/process/src/node/multi-ring-buffer.spec.ts b/packages/process/src/node/multi-ring-buffer.spec.ts index ce1bdb32d8c1b..41f86662dfc9b 100644 --- a/packages/process/src/node/multi-ring-buffer.spec.ts +++ b/packages/process/src/node/multi-ring-buffer.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/process/src/node/multi-ring-buffer.ts b/packages/process/src/node/multi-ring-buffer.ts index f2fe8f0cf8cd2..d2edfd3555fb0 100644 --- a/packages/process/src/node/multi-ring-buffer.ts +++ b/packages/process/src/node/multi-ring-buffer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as stream from 'stream'; diff --git a/packages/process/src/node/process-backend-module.ts b/packages/process/src/node/process-backend-module.ts index 9d7cb826655e2..143b71430e3d6 100644 --- a/packages/process/src/node/process-backend-module.ts +++ b/packages/process/src/node/process-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, Container } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/node/process-manager.ts b/packages/process/src/node/process-manager.ts index 97c2d684870fc..b37897318d8a2 100644 --- a/packages/process/src/node/process-manager.ts +++ b/packages/process/src/node/process-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; import { Emitter, Event } from '@theia/core/lib/common'; diff --git a/packages/process/src/node/process.ts b/packages/process/src/node/process.ts index faf3f96b88df3..490ee09015563 100644 --- a/packages/process/src/node/process.ts +++ b/packages/process/src/node/process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, unmanaged } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/node/pseudo-pty.ts b/packages/process/src/node/pseudo-pty.ts index 1219789849e2a..245a66dd2b211 100644 --- a/packages/process/src/node/pseudo-pty.ts +++ b/packages/process/src/node/pseudo-pty.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { IPty } from 'node-pty'; diff --git a/packages/process/src/node/raw-process.spec.ts b/packages/process/src/node/raw-process.spec.ts index c55983fc91a57..377a2e7bb431a 100644 --- a/packages/process/src/node/raw-process.spec.ts +++ b/packages/process/src/node/raw-process.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; import * as process from 'process'; diff --git a/packages/process/src/node/raw-process.ts b/packages/process/src/node/raw-process.ts index 586917cd928d4..6e6b3c7a9aa5f 100644 --- a/packages/process/src/node/raw-process.ts +++ b/packages/process/src/node/raw-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/node/string-argv.d.ts b/packages/process/src/node/string-argv.d.ts index b915667fa415c..9fd336fc7a8d2 100644 --- a/packages/process/src/node/string-argv.d.ts +++ b/packages/process/src/node/string-argv.d.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** declare module 'string-argv' { diff --git a/packages/process/src/node/task-terminal-process.ts b/packages/process/src/node/task-terminal-process.ts index c2e0802fb05e0..ea364cd832a77 100644 --- a/packages/process/src/node/task-terminal-process.ts +++ b/packages/process/src/node/task-terminal-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/node/terminal-process.spec.ts b/packages/process/src/node/terminal-process.spec.ts index 7ba878ae7edcb..f5d144ff05e97 100644 --- a/packages/process/src/node/terminal-process.spec.ts +++ b/packages/process/src/node/terminal-process.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; import * as process from 'process'; diff --git a/packages/process/src/node/terminal-process.ts b/packages/process/src/node/terminal-process.ts index 0ec67d6fb45c4..8c4790c77d395 100644 --- a/packages/process/src/node/terminal-process.ts +++ b/packages/process/src/node/terminal-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/process/src/node/test/process-fork-test.js b/packages/process/src/node/test/process-fork-test.js index 69a3de3586103..bb818a36653d9 100644 --- a/packages/process/src/node/test/process-fork-test.js +++ b/packages/process/src/node/test/process-fork-test.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** if (process.argv[2] === 'version') { diff --git a/packages/process/src/node/test/process-test-container.ts b/packages/process/src/node/test/process-test-container.ts index 3c9da6a73f0a3..fbcb776db5d04 100644 --- a/packages/process/src/node/test/process-test-container.ts +++ b/packages/process/src/node/test/process-test-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from '@theia/core/shared/inversify'; import { bindLogger } from '@theia/core/lib/node/logger-backend-module'; diff --git a/packages/process/src/node/utils.ts b/packages/process/src/node/utils.ts index fd676157c838c..6415cf3cf7491 100644 --- a/packages/process/src/node/utils.ts +++ b/packages/process/src/node/utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { isWindows } from '@theia/core'; diff --git a/packages/property-view/package.json b/packages/property-view/package.json index 921cdf7e1d9ee..722f9795179e7 100644 --- a/packages/property-view/package.json +++ b/packages/property-view/package.json @@ -17,7 +17,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/property-view/src/browser/empty-property-view-widget-provider.tsx b/packages/property-view/src/browser/empty-property-view-widget-provider.tsx index c3b2a4d73f07f..3df54697d34aa 100644 --- a/packages/property-view/src/browser/empty-property-view-widget-provider.tsx +++ b/packages/property-view/src/browser/empty-property-view-widget-provider.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core/lib/common/nls'; diff --git a/packages/property-view/src/browser/property-data-service.ts b/packages/property-view/src/browser/property-data-service.ts index f4a3e81725bb4..983b640b70987 100644 --- a/packages/property-view/src/browser/property-data-service.ts +++ b/packages/property-view/src/browser/property-data-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const PropertyDataService = Symbol('PropertyDataService'); diff --git a/packages/property-view/src/browser/property-view-content-widget.ts b/packages/property-view/src/browser/property-view-content-widget.ts index 91d6a72dcb553..f3d4fb795c6ba 100644 --- a/packages/property-view/src/browser/property-view-content-widget.ts +++ b/packages/property-view/src/browser/property-view-content-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget } from '@theia/core/lib/browser/widgets/widget'; diff --git a/packages/property-view/src/browser/property-view-contribution.ts b/packages/property-view/src/browser/property-view-contribution.ts index 594aab93d1446..a459f8c03eb10 100644 --- a/packages/property-view/src/browser/property-view-contribution.ts +++ b/packages/property-view/src/browser/property-view-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AbstractViewContribution } from '@theia/core/lib/browser/shell/view-contribution'; diff --git a/packages/property-view/src/browser/property-view-frontend-module.ts b/packages/property-view/src/browser/property-view-frontend-module.ts index f8c8978108f82..2ed1e08abdc52 100644 --- a/packages/property-view/src/browser/property-view-frontend-module.ts +++ b/packages/property-view/src/browser/property-view-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { bindViewContribution, WidgetFactory } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/property-view-service.ts b/packages/property-view/src/browser/property-view-service.ts index 58acf4e3961b6..e1b551231ccac 100644 --- a/packages/property-view/src/browser/property-view-service.ts +++ b/packages/property-view/src/browser/property-view-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContributionProvider, Prioritizeable } from '@theia/core'; diff --git a/packages/property-view/src/browser/property-view-widget-provider.ts b/packages/property-view/src/browser/property-view-widget-provider.ts index 31618432a0b8e..09edbfdf25068 100644 --- a/packages/property-view/src/browser/property-view-widget-provider.ts +++ b/packages/property-view/src/browser/property-view-widget-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContributionProvider, MaybePromise, Prioritizeable } from '@theia/core'; diff --git a/packages/property-view/src/browser/property-view-widget.tsx b/packages/property-view/src/browser/property-view-widget.tsx index bb9cd2f1601c8..75666dc5cce4c 100644 --- a/packages/property-view/src/browser/property-view-widget.tsx +++ b/packages/property-view/src/browser/property-view-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Message } from '@theia/core/shared/@phosphor/messaging'; diff --git a/packages/property-view/src/browser/resource-property-view/index.ts b/packages/property-view/src/browser/resource-property-view/index.ts index 54188d480dba8..30f988a51856f 100644 --- a/packages/property-view/src/browser/resource-property-view/index.ts +++ b/packages/property-view/src/browser/resource-property-view/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './resource-property-view-tree-container'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-data-service.spec.ts b/packages/property-view/src/browser/resource-property-view/resource-property-data-service.spec.ts index bd38dcf1c6ec6..fa97a351b7540 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-data-service.spec.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-data-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-data-service.ts b/packages/property-view/src/browser/resource-property-view/resource-property-data-service.ts index 55099a627e2ec..b8610996c383b 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-data-service.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-data-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Navigatable } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.spec.ts b/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.spec.ts index a40d6f71bd53b..7bde9ae6cf791 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.spec.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; @@ -24,7 +24,7 @@ FrontendApplicationConfigProvider.set({}); import { Container } from '@theia/core/shared/inversify'; import { TreeNode } from '@theia/core/lib/browser/tree/tree'; -import { DEFAULT_INFO_ICON, ResourcePropertiesLabelProvider, } from './resource-property-view-label-provider'; +import { DEFAULT_INFO_ICON, ResourcePropertiesLabelProvider, } from './resource-property-view-label-provider'; import { LabelProvider, LabelProviderContribution } from '@theia/core/lib/browser/label-provider'; import { ContributionProvider } from '@theia/core/lib/common'; import { ResourcePropertiesCategoryNode, ResourcePropertiesItemNode } from './resource-property-view-tree-items'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.ts b/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.ts index fa9272f767120..01a57134597d3 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { codicon, LabelProvider, LabelProviderContribution, TreeNode } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-container.ts b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-container.ts index 7f08e7707cab4..3df2c352a97c4 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-container.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { createTreeContainer, LabelProviderContribution, TreeProps } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-items.ts b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-items.ts index e3546cdf81334..216ba70284626 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-items.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-items.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CompositeTreeNode, ExpandableTreeNode, SelectableTreeNode, TreeNode } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx index 521d0b91b54bb..8d65df3b613ac 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-widget-provider.ts b/packages/property-view/src/browser/resource-property-view/resource-property-view-widget-provider.ts index 20a11e4275cdf..54c1c996704cd 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-widget-provider.ts +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-widget-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Navigatable } from '@theia/core/lib/browser'; diff --git a/packages/property-view/src/browser/style/property-view.css b/packages/property-view/src/browser/style/property-view.css index 9c007d83fc22e..ad59fc3e6dd4f 100644 --- a/packages/property-view/src/browser/style/property-view.css +++ b/packages/property-view/src/browser/style/property-view.css @@ -11,41 +11,41 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-property-view-widget-padding: 5px; - --theia-empty-property-view-widget-padding: 8px; - --theia-resource-tree-node-icon-margin: 0 3px; - --theia-resource-tree-node-icon-flex-basis: 1.5%; - --theia-resource-tree-node-name-flex-basis: 30%; - --theia-resource-tree-node-property-flex-basis: 70%; + --theia-property-view-widget-padding: 5px; + --theia-empty-property-view-widget-padding: 8px; + --theia-resource-tree-node-icon-margin: 0 3px; + --theia-resource-tree-node-icon-flex-basis: 1.5%; + --theia-resource-tree-node-name-flex-basis: 30%; + --theia-resource-tree-node-property-flex-basis: 70%; } .theia-property-view-widget { - padding: var(--theia-border-width); + padding: var(--theia-border-width); } #theia-empty-property-view .theia-widget-noInfo { - padding: var(--theia-empty-property-view-widget-padding); + padding: var(--theia-empty-property-view-widget-padding); } .theia-property-view-widget .treeContainer { - height: 100%; + height: 100%; } .theia-resource-tree-node-icon { - margin: var(--theia-resource-tree-node-icon-margin); - flex-basis: var(--theia-resource-tree-node-icon-flex-basis); - align-self: center; - text-align: center; + margin: var(--theia-resource-tree-node-icon-margin); + flex-basis: var(--theia-resource-tree-node-icon-flex-basis); + align-self: center; + text-align: center; } .theia-resource-tree-node-name { - flex-basis: var(--theia-resource-tree-node-name-flex-basis); + flex-basis: var(--theia-resource-tree-node-name-flex-basis); } .theia-resource-tree-node-property { - flex-basis: var(--theia-resource-tree-node-property-flex-basis); + flex-basis: var(--theia-resource-tree-node-property-flex-basis); } diff --git a/packages/property-view/src/package.spec.ts b/packages/property-view/src/package.spec.ts index 1a90778d60abb..b5cb50d044b91 100644 --- a/packages/property-view/src/package.spec.ts +++ b/packages/property-view/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/scm-extra/package.json b/packages/scm-extra/package.json index b1a0071516239..2cdb91df75189 100644 --- a/packages/scm-extra/package.json +++ b/packages/scm-extra/package.json @@ -20,7 +20,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/scm-extra/src/browser/history/index.ts b/packages/scm-extra/src/browser/history/index.ts index 140c21eaf7496..3b738cb39e62c 100644 --- a/packages/scm-extra/src/browser/history/index.ts +++ b/packages/scm-extra/src/browser/history/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './scm-history-provider'; diff --git a/packages/scm-extra/src/browser/history/scm-history-constants.ts b/packages/scm-extra/src/browser/history/scm-history-constants.ts index 88d7dfbe1609d..b445482c842f3 100644 --- a/packages/scm-extra/src/browser/history/scm-history-constants.ts +++ b/packages/scm-extra/src/browser/history/scm-history-constants.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, Event, nls } from '@theia/core'; diff --git a/packages/scm-extra/src/browser/history/scm-history-contribution.ts b/packages/scm-extra/src/browser/history/scm-history-contribution.ts index 9d03e681410e8..12124c6bf27e1 100644 --- a/packages/scm-extra/src/browser/history/scm-history-contribution.ts +++ b/packages/scm-extra/src/browser/history/scm-history-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { MenuModelRegistry, CommandRegistry, SelectionService } from '@theia/core'; diff --git a/packages/scm-extra/src/browser/history/scm-history-frontend-module.ts b/packages/scm-extra/src/browser/history/scm-history-frontend-module.ts index dbb0818484dba..de1c0236eed03 100644 --- a/packages/scm-extra/src/browser/history/scm-history-frontend-module.ts +++ b/packages/scm-extra/src/browser/history/scm-history-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/scm-extra/src/browser/history/scm-history-provider.ts b/packages/scm-extra/src/browser/history/scm-history-provider.ts index ba4490d52e245..9a734a4e80e2d 100644 --- a/packages/scm-extra/src/browser/history/scm-history-provider.ts +++ b/packages/scm-extra/src/browser/history/scm-history-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ScmProvider } from '@theia/scm/lib/browser/scm-provider'; diff --git a/packages/scm-extra/src/browser/history/scm-history-widget.tsx b/packages/scm-extra/src/browser/history/scm-history-widget.tsx index f9ca5334a478e..6c548550d6e25 100644 --- a/packages/scm-extra/src/browser/history/scm-history-widget.tsx +++ b/packages/scm-extra/src/browser/history/scm-history-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/scm-extra/src/browser/scm-extra-contribution.ts b/packages/scm-extra/src/browser/scm-extra-contribution.ts index 4ec56ede81ec7..f8387635254c6 100644 --- a/packages/scm-extra/src/browser/scm-extra-contribution.ts +++ b/packages/scm-extra/src/browser/scm-extra-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser'; diff --git a/packages/scm-extra/src/browser/scm-extra-frontend-module.ts b/packages/scm-extra/src/browser/scm-extra-frontend-module.ts index bc8d6c5b3d913..8dabcdaf5a013 100644 --- a/packages/scm-extra/src/browser/scm-extra-frontend-module.ts +++ b/packages/scm-extra/src/browser/scm-extra-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/scm-extra/src/browser/scm-extra-layout-migrations.ts b/packages/scm-extra/src/browser/scm-extra-layout-migrations.ts index cf5c66be41cf9..45961a64875af 100644 --- a/packages/scm-extra/src/browser/scm-extra-layout-migrations.ts +++ b/packages/scm-extra/src/browser/scm-extra-layout-migrations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm-extra/src/browser/scm-file-change-label-provider.ts b/packages/scm-extra/src/browser/scm-file-change-label-provider.ts index dd4f3bb112835..cf60762f24bff 100644 --- a/packages/scm-extra/src/browser/scm-file-change-label-provider.ts +++ b/packages/scm-extra/src/browser/scm-file-change-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/scm-extra/src/browser/scm-file-change-node.ts b/packages/scm-extra/src/browser/scm-file-change-node.ts index ce38d77cdf646..07fb2b8fa18d3 100644 --- a/packages/scm-extra/src/browser/scm-file-change-node.ts +++ b/packages/scm-extra/src/browser/scm-file-change-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ScmCommit } from '@theia/scm/lib/browser/scm-provider'; diff --git a/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx b/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx index 25b67aa7919dd..893324d9cca0c 100644 --- a/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx +++ b/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { SELECTED_CLASS, Key, Widget } from '@theia/core/lib/browser'; diff --git a/packages/scm-extra/src/browser/style/history.css b/packages/scm-extra/src/browser/style/history.css index f6e9495cb8c16..a1e122aff9967 100644 --- a/packages/scm-extra/src/browser/style/history.css +++ b/packages/scm-extra/src/browser/style/history.css @@ -11,117 +11,154 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-scm-history .history-container { - display: flex; - flex-direction: column; - position: relative; - height: 100%; + display: flex; + flex-direction: column; + position: relative; + height: 100%; } .theia-scm-history .listContainer { - flex: 1; - position: relative; + flex: 1; + position: relative; } .theia-scm-history .commitList { - height: 100%; + height: 100%; } .theia-scm-history .history-container .noWrapInfo { - width: 100%; + width: 100%; } - .theia-scm-history .commitList .commitListElement { - margin: 3px 0; + margin: 3px 0; } .theia-scm-history .commitListElement.first .containerHead { - border: none; + border: none; } .theia-scm-history .commitListElement .containerHead { - width: calc(100% - 5px); - height: 50px; - display: flex; - align-items: center; - border-top: 1px solid var(--theia-contrastBorder); + width: calc(100% - 5px); + height: 50px; + display: flex; + align-items: center; + border-top: 1px solid var(--theia-contrastBorder); } .theia-scm-history .commitListElement .containerHead:hover { - background-color: var(--theia-list-hoverBackground); - color: var(--theia-list-hoverForeground); - cursor: pointer; + background-color: var(--theia-list-hoverBackground); + color: var(--theia-list-hoverForeground); + cursor: pointer; } -.theia-scm-history:focus-within .commitListElement .containerHead.theia-mod-selected { - background: var(--theia-list-focusBackground); - color: var(--theia-list-focusForeground); +.theia-scm-history:focus-within + .commitListElement + .containerHead.theia-mod-selected { + background: var(--theia-list-focusBackground); + color: var(--theia-list-focusForeground); } -.theia-scm-history:not(:focus-within) .commitListElement .containerHead.theia-mod-selected { - background: var(--theia-list-inactiveFocusBackground); +.theia-scm-history:not(:focus-within) + .commitListElement + .containerHead.theia-mod-selected { + background: var(--theia-list-inactiveFocusBackground); } .theia-scm-history .commitListElement .containerHead .headContent { - display: flex; - width: 100%; - box-sizing: border-box; - padding: 0 8px 0 2px; -} - -.theia-scm-history .commitListElement .containerHead .headContent .image-container { - margin-right: 5px; -} - -.theia-scm-history .commitListElement .containerHead .headContent .image-container img { - width: 27px; -} - -.theia-scm-history .commitListElement .containerHead .headContent .headLabelContainer { - min-width: calc(100% - 93px); -} - -.theia-scm-history .commitListElement .containerHead .headContent .headLabelContainer.singleFileMode { - width: 100%; -} - -.theia-scm-history .commitListElement .containerHead .headContent .expansionToggle { - display: flex; - align-items: center; -} - -.theia-scm-history .commitListElement .containerHead .headContent .detailButton { - display: flex; - align-items: center; - visibility: hidden; - margin: 0 5px; -} - -.theia-scm-history .commitListElement .containerHead:hover .headContent .detailButton { - visibility: visible; -} - -.theia-scm-history .commitListElement .containerHead .headContent .expansionToggle > .toggle { - display: flex; - background: var(--theia-list-focusBackground); - padding: 5px; - border-radius: 7px; - margin-left: 5px; - align-items: center; - justify-content: flex-end; - min-width: 30px; - color: var(--theia-theia-list-focusForeground); + display: flex; + width: 100%; + box-sizing: border-box; + padding: 0 8px 0 2px; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .image-container { + margin-right: 5px; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .image-container + img { + width: 27px; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .headLabelContainer { + min-width: calc(100% - 93px); +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .headLabelContainer.singleFileMode { + width: 100%; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .expansionToggle { + display: flex; + align-items: center; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .detailButton { + display: flex; + align-items: center; + visibility: hidden; + margin: 0 5px; +} + +.theia-scm-history + .commitListElement + .containerHead:hover + .headContent + .detailButton { + visibility: visible; +} + +.theia-scm-history + .commitListElement + .containerHead + .headContent + .expansionToggle + > .toggle { + display: flex; + background: var(--theia-list-focusBackground); + padding: 5px; + border-radius: 7px; + margin-left: 5px; + align-items: center; + justify-content: flex-end; + min-width: 30px; + color: var(--theia-theia-list-focusForeground); } .theia-scm-history .commitTime { - color: var(--theia-descriptionForeground); - font-size: smaller; + color: var(--theia-descriptionForeground); + font-size: smaller; } .theia-scm-history .large-spinner { - font-size: 48px; + font-size: 48px; } diff --git a/packages/scm/package.json b/packages/scm/package.json index 453ea0002d778..fdcd3cae91114 100644 --- a/packages/scm/package.json +++ b/packages/scm/package.json @@ -23,7 +23,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/scm/src/browser/decorations/scm-decorations-service.ts b/packages/scm/src/browser/decorations/scm-decorations-service.ts index 1281744cba1c6..53dd72eb16341 100644 --- a/packages/scm/src/browser/decorations/scm-decorations-service.ts +++ b/packages/scm/src/browser/decorations/scm-decorations-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/decorations/scm-navigator-decorator.ts b/packages/scm/src/browser/decorations/scm-navigator-decorator.ts index cbf31c89c5d45..4c08d132af099 100644 --- a/packages/scm/src/browser/decorations/scm-navigator-decorator.ts +++ b/packages/scm/src/browser/decorations/scm-navigator-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/decorations/scm-tab-bar-decorator.ts b/packages/scm/src/browser/decorations/scm-tab-bar-decorator.ts index 3f3364c1878c2..a476551ba4cc2 100644 --- a/packages/scm/src/browser/decorations/scm-tab-bar-decorator.ts +++ b/packages/scm/src/browser/decorations/scm-tab-bar-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/dirty-diff/content-lines.spec.ts b/packages/scm/src/browser/dirty-diff/content-lines.spec.ts index e9d904a0510c2..0c11bb16075da 100644 --- a/packages/scm/src/browser/dirty-diff/content-lines.spec.ts +++ b/packages/scm/src/browser/dirty-diff/content-lines.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/scm/src/browser/dirty-diff/content-lines.ts b/packages/scm/src/browser/dirty-diff/content-lines.ts index 1489f4033401c..d3c0a2207ec4d 100644 --- a/packages/scm/src/browser/dirty-diff/content-lines.ts +++ b/packages/scm/src/browser/dirty-diff/content-lines.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export interface ContentLines extends ArrayLike { diff --git a/packages/scm/src/browser/dirty-diff/diff-computer.spec.ts b/packages/scm/src/browser/dirty-diff/diff-computer.spec.ts index 6d54a1c26305b..34fa24e51a27c 100644 --- a/packages/scm/src/browser/dirty-diff/diff-computer.spec.ts +++ b/packages/scm/src/browser/dirty-diff/diff-computer.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/scm/src/browser/dirty-diff/diff-computer.ts b/packages/scm/src/browser/dirty-diff/diff-computer.ts index 12e23709ec2f2..5662cb993a54e 100644 --- a/packages/scm/src/browser/dirty-diff/diff-computer.ts +++ b/packages/scm/src/browser/dirty-diff/diff-computer.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as jsdiff from 'diff'; diff --git a/packages/scm/src/browser/dirty-diff/dirty-diff-decorator.ts b/packages/scm/src/browser/dirty-diff/dirty-diff-decorator.ts index 12593749462c5..a6ff31676d959 100644 --- a/packages/scm/src/browser/dirty-diff/dirty-diff-decorator.ts +++ b/packages/scm/src/browser/dirty-diff/dirty-diff-decorator.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/dirty-diff/dirty-diff-module.ts b/packages/scm/src/browser/dirty-diff/dirty-diff-module.ts index 7af7249d565c4..1982324afa773 100644 --- a/packages/scm/src/browser/dirty-diff/dirty-diff-module.ts +++ b/packages/scm/src/browser/dirty-diff/dirty-diff-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-amend-component.tsx b/packages/scm/src/browser/scm-amend-component.tsx index 2a53fd3892e4f..91561fb0040a9 100644 --- a/packages/scm/src/browser/scm-amend-component.tsx +++ b/packages/scm/src/browser/scm-amend-component.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/scm-amend-component.css'; diff --git a/packages/scm/src/browser/scm-amend-widget.tsx b/packages/scm/src/browser/scm-amend-widget.tsx index 5cca544809e38..ee331d0dfb064 100644 --- a/packages/scm/src/browser/scm-amend-widget.tsx +++ b/packages/scm/src/browser/scm-amend-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-avatar-service.ts b/packages/scm/src/browser/scm-avatar-service.ts index b40503c3b0c23..06e2c55927b8b 100644 --- a/packages/scm/src/browser/scm-avatar-service.ts +++ b/packages/scm/src/browser/scm-avatar-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-commit-widget.tsx b/packages/scm/src/browser/scm-commit-widget.tsx index 917c2870e4d8c..71fadca0f286a 100644 --- a/packages/scm/src/browser/scm-commit-widget.tsx +++ b/packages/scm/src/browser/scm-commit-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-context-key-service.ts b/packages/scm/src/browser/scm-context-key-service.ts index a8c13cc7bc7ff..410ab84d43389 100644 --- a/packages/scm/src/browser/scm-context-key-service.ts +++ b/packages/scm/src/browser/scm-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-contribution.ts b/packages/scm/src/browser/scm-contribution.ts index 49b678ddf81b4..032079923632a 100644 --- a/packages/scm/src/browser/scm-contribution.ts +++ b/packages/scm/src/browser/scm-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; import { Emitter } from '@theia/core/lib/common/event'; diff --git a/packages/scm/src/browser/scm-frontend-module.ts b/packages/scm/src/browser/scm-frontend-module.ts index b20b6f0ee0c3e..a45ac0e124c5e 100644 --- a/packages/scm/src/browser/scm-frontend-module.ts +++ b/packages/scm/src/browser/scm-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/scm/src/browser/scm-groups-tree-model.ts b/packages/scm/src/browser/scm-groups-tree-model.ts index c05b8f4e1c713..3b88dc49d250f 100644 --- a/packages/scm/src/browser/scm-groups-tree-model.ts +++ b/packages/scm/src/browser/scm-groups-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-input.ts b/packages/scm/src/browser/scm-input.ts index 9ca807ff54a68..c9c8be7f01384 100644 --- a/packages/scm/src/browser/scm-input.ts +++ b/packages/scm/src/browser/scm-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/scm/src/browser/scm-layout-migrations.ts b/packages/scm/src/browser/scm-layout-migrations.ts index 6290c9bca309e..7ea52fa1fda87 100644 --- a/packages/scm/src/browser/scm-layout-migrations.ts +++ b/packages/scm/src/browser/scm-layout-migrations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-no-repository-widget.tsx b/packages/scm/src/browser/scm-no-repository-widget.tsx index ce96ef23a56c5..f779427e637a9 100644 --- a/packages/scm/src/browser/scm-no-repository-widget.tsx +++ b/packages/scm/src/browser/scm-no-repository-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-preferences.ts b/packages/scm/src/browser/scm-preferences.ts index 3a5cd75a9d1b9..7b4762fd5d91c 100644 --- a/packages/scm/src/browser/scm-preferences.ts +++ b/packages/scm/src/browser/scm-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-provider.ts b/packages/scm/src/browser/scm-provider.ts index 7e0b87999ddd6..9017eac8ecc69 100644 --- a/packages/scm/src/browser/scm-provider.ts +++ b/packages/scm/src/browser/scm-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/scm/src/browser/scm-quick-open-service.ts b/packages/scm/src/browser/scm-quick-open-service.ts index 044e5f4f862dc..00f2a414a2558 100644 --- a/packages/scm/src/browser/scm-quick-open-service.ts +++ b/packages/scm/src/browser/scm-quick-open-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-repository.ts b/packages/scm/src/browser/scm-repository.ts index 12b8ec25b9942..721f620f87ad1 100644 --- a/packages/scm/src/browser/scm-repository.ts +++ b/packages/scm/src/browser/scm-repository.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Disposable, DisposableCollection, Emitter } from '@theia/core/lib/common'; diff --git a/packages/scm/src/browser/scm-service.ts b/packages/scm/src/browser/scm-service.ts index 1ef87fc8b1537..4f613a5a9416c 100644 --- a/packages/scm/src/browser/scm-service.ts +++ b/packages/scm/src/browser/scm-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/scm/src/browser/scm-tree-label-provider.ts b/packages/scm/src/browser/scm-tree-label-provider.ts index aa2c7614c7e10..91e6024a6fb3f 100644 --- a/packages/scm/src/browser/scm-tree-label-provider.ts +++ b/packages/scm/src/browser/scm-tree-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-tree-model.ts b/packages/scm/src/browser/scm-tree-model.ts index 266f233cf5f31..6896d3c5896c9 100644 --- a/packages/scm/src/browser/scm-tree-model.ts +++ b/packages/scm/src/browser/scm-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/scm/src/browser/scm-tree-widget.tsx b/packages/scm/src/browser/scm-tree-widget.tsx index 9a868729b50c3..7bdd2d2852ff7 100644 --- a/packages/scm/src/browser/scm-tree-widget.tsx +++ b/packages/scm/src/browser/scm-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable no-null/no-null, @typescript-eslint/no-explicit-any */ diff --git a/packages/scm/src/browser/scm-widget.tsx b/packages/scm/src/browser/scm-widget.tsx index 5b4e20e34dd7d..58dbea305f15f 100644 --- a/packages/scm/src/browser/scm-widget.tsx +++ b/packages/scm/src/browser/scm-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable no-null/no-null, @typescript-eslint/no-explicit-any */ diff --git a/packages/scm/src/browser/style/dirty-diff.css b/packages/scm/src/browser/style/dirty-diff.css index 1f27f060dcaba..d1ce649116bc4 100644 --- a/packages/scm/src/browser/style/dirty-diff.css +++ b/packages/scm/src/browser/style/dirty-diff.css @@ -11,40 +11,40 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ -@import 'dirty-diff-decorator.css'; +@import "dirty-diff-decorator.css"; .monaco-editor .dirty-diff-added-line { - border-left: 3px solid var(--theia-editorGutter-addedBackground); - transition: opacity 0.5s; + border-left: 3px solid var(--theia-editorGutter-addedBackground); + transition: opacity 0.5s; } .monaco-editor .dirty-diff-added-line:before { - background: var(--theia-editorGutter-addedBackground); + background: var(--theia-editorGutter-addedBackground); } .monaco-editor .margin:hover .dirty-diff-added-line { - opacity: 1; + opacity: 1; } .monaco-editor .dirty-diff-removed-line:after { - border-left: 4px solid var(--theia-editorGutter-deletedBackground); - transition: opacity 0.5s; + border-left: 4px solid var(--theia-editorGutter-deletedBackground); + transition: opacity 0.5s; } .monaco-editor .dirty-diff-removed-line:before { - background: var(--theia-editorGutter-deletedBackground); + background: var(--theia-editorGutter-deletedBackground); } .monaco-editor .margin:hover .dirty-diff-removed-line { - opacity: 1; + opacity: 1; } .monaco-editor .dirty-diff-modified-line { - border-left: 3px solid var(--theia-editorGutter-modifiedBackground); - transition: opacity 0.5s; + border-left: 3px solid var(--theia-editorGutter-modifiedBackground); + transition: opacity 0.5s; } .monaco-editor .dirty-diff-modified-line:before { - background: var(--theia-editorGutter-modifiedBackground); + background: var(--theia-editorGutter-modifiedBackground); } .monaco-editor .margin:hover .dirty-diff-modified-line { - opacity: 1; + opacity: 1; } diff --git a/packages/scm/src/browser/style/index.css b/packages/scm/src/browser/style/index.css index 77bf11bd9923e..6ccc9e7c43fb2 100644 --- a/packages/scm/src/browser/style/index.css +++ b/packages/scm/src/browser/style/index.css @@ -11,212 +11,216 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-scm-commit { - overflow: hidden; - font-size: var(--theia-ui-font-size1); - max-height: calc(100% - var(--theia-border-width)); - position: relative; + overflow: hidden; + font-size: var(--theia-ui-font-size1); + max-height: calc(100% - var(--theia-border-width)); + position: relative; } .theia-scm { - padding: 5px; - box-sizing: border-box; - height: 100%; + padding: 5px; + box-sizing: border-box; + height: 100%; } .theia-side-panel .theia-scm { - padding-left: 19px; + padding-left: 19px; } .groups-outer-container:focus { - outline: 0; - box-shadow: none; - border: none; + outline: 0; + box-shadow: none; + border: none; } .theia-scm .noWrapInfo { - width: 100%; - align-items: center; + width: 100%; + align-items: center; } -.theia-scm:focus, .theia-scm :focus { - outline: 0; - box-shadow: none; - border: none; +.theia-scm:focus, +.theia-scm :focus { + outline: 0; + box-shadow: none; + border: none; } .theia-scm .space-between { - justify-content: space-between; + justify-content: space-between; } .theia-scm .changesHeader { - font-weight: bold; + font-weight: bold; } .theia-scm .theia-scm-amend { - margin: 5px 0; + margin: 5px 0; } .theia-scm #messageInputContainer { - position: relative; + position: relative; } .theia-scm #repositoryListContainer { - display: flex; - margin-bottom: 5px; - flex: 1; + display: flex; + margin-bottom: 5px; + flex: 1; } .theia-scm .groups-outer-container { - overflow-y: auto; - width: 100%; - flex-grow: 1; + overflow-y: auto; + width: 100%; + flex-grow: 1; } .theia-scm .warn { - background-color: var(--theia-inputValidation-warningBackground) !important; + background-color: var(--theia-inputValidation-warningBackground) !important; } .theia-scm-main-container { - display: flex; - flex-direction: column; - height: 100%; + display: flex; + flex-direction: column; + height: 100%; } .theia-scm-input-message-container { - display: flex; - flex-direction: column; - margin: 0px 0px 7px 0px; - max-height: 400px; + display: flex; + flex-direction: column; + margin: 0px 0px 7px 0px; + max-height: 400px; } .theia-scm-input-message-container textarea { - line-height: var(--theia-content-line-height); - resize: none; - box-sizing: border-box; - min-height: 32px; - padding: 4px; - border: none; + line-height: var(--theia-content-line-height); + resize: none; + box-sizing: border-box; + min-height: 32px; + padding: 4px; + border: none; } .theia-scm-input-message-container textarea:placeholder-shown { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .theia-scm-input-message-container textarea:focus { - outline: var(--theia-border-width) solid var(--theia-focusBorder); + outline: var(--theia-border-width) solid var(--theia-focusBorder); } .theia-scm-input-message { - width: 100%; + width: 100%; } .theia-scm-input-message-idle:not(:focus) { - border-color: var(--theia-input-border); + border-color: var(--theia-input-border); } .theia-scm-input-message-info { - border-color: var(--theia-inputValidation-infoBorder) !important; + border-color: var(--theia-inputValidation-infoBorder) !important; } .theia-scm-input-message-success { - border-color: var(--theia-successBackground) !important; + border-color: var(--theia-successBackground) !important; } .theia-scm-input-message-warning { - border-color: var(--theia-inputValidation-warningBorder) !important; + border-color: var(--theia-inputValidation-warningBorder) !important; } .theia-scm-input-message-error { - border-color: var(--theia-inputValidation-errorBorder) !important; + border-color: var(--theia-inputValidation-errorBorder) !important; } .theia-scm-message, .theia-scm-input-validation-message { - padding: 4px 4px 4px 4px; + padding: 4px 4px 4px 4px; } .theia-scm-validation-message-info { - background-color: var(--theia-inputValidation-infoBackground) !important; - color: var(--theia-inputValidation-infoForeground); - border: var(--theia-border-width) solid var(--theia-inputValidation-infoBorder); - border-top: none; /* remove top border since the input declares it already */ + background-color: var(--theia-inputValidation-infoBackground) !important; + color: var(--theia-inputValidation-infoForeground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-infoBorder); + border-top: none; /* remove top border since the input declares it already */ } .theia-scm-validation-message-success { - background-color: var(--theia-successBackground) !important; - color: var(--theia-inputValidation-warningBackground); + background-color: var(--theia-successBackground) !important; + color: var(--theia-inputValidation-warningBackground); } .theia-scm-message-warning, .theia-scm-validation-message-warning { - background-color: var(--theia-inputValidation-warningBackground) !important; - color: var(--theia-inputValidation-warningForeground); - border: var(--theia-border-width) solid var(--theia-inputValidation-warningBorder); - border-top: none; /* remove top border since the input declares it already */ + background-color: var(--theia-inputValidation-warningBackground) !important; + color: var(--theia-inputValidation-warningForeground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-warningBorder); + border-top: none; /* remove top border since the input declares it already */ } .theia-scm-validation-message-error { - background-color: var(--theia-inputValidation-errorBackground) !important; - color: var(--theia-inputValidation-errorForeground); - border: var(--theia-border-width) solid var(--theia-inputValidation-errorBorder); - border-top: none; /* remove top border since the input declares it already */ + background-color: var(--theia-inputValidation-errorBackground) !important; + color: var(--theia-inputValidation-errorForeground); + border: var(--theia-border-width) solid + var(--theia-inputValidation-errorBorder); + border-top: none; /* remove top border since the input declares it already */ } .no-select:focus { - outline: none; + outline: none; } .theia-scm .scmItem { - font-size: var(--theia-ui-font-size1); - display: flex; - align-items: center; - justify-content: space-between; - height: var(--theia-content-line-height); - line-height: var(--theia-content-line-height); - padding: 0px calc(var(--theia-ui-padding)/2); + font-size: var(--theia-ui-font-size1); + display: flex; + align-items: center; + justify-content: space-between; + height: var(--theia-content-line-height); + line-height: var(--theia-content-line-height); + padding: 0px calc(var(--theia-ui-padding) / 2); } .theia-scm .scmItem:hover { - cursor: pointer; + cursor: pointer; } .theia-scm:focus-within .scmItem:focus { - background: var(--theia-list-focusBackground); - color: var(--theia-list-focusForeground); + background: var(--theia-list-focusBackground); + color: var(--theia-list-focusForeground); } .theia-scm:not(:focus-within) .scmItem:not(:focus) { - background: var(--theia-list-inactiveFocusBackground); + background: var(--theia-list-inactiveFocusBackground); } .theia-scm:focus-within .scmItem.theia-mod-selected { - background: var(--theia-list-activeSelectionBackground); - color: var(--theia-list-activeSelectionForeground); + background: var(--theia-list-activeSelectionBackground); + color: var(--theia-list-activeSelectionForeground); } .theia-scm:not(:focus-within) .scmItem.theia-mod-selected { - background: var(--theia-list-inactiveSelectionBackground); - color: var(--theia-list-inactiveSelectionForeground); + background: var(--theia-list-inactiveSelectionBackground); + color: var(--theia-list-inactiveSelectionForeground); } .theia-scm .scmItem .path { - font-size: var(--theia-ui-font-size0); - margin-left: var(--theia-ui-padding); - opacity: .7; + font-size: var(--theia-ui-font-size0); + margin-left: var(--theia-ui-padding); + opacity: 0.7; } .theia-scm .scmItem .status { - width: 16px; - text-align: center; - padding-top: 2px; - padding-bottom: 2px; - font-size: var(--theia-ui-font-size0); + width: 16px; + text-align: center; + padding-top: 2px; + padding-bottom: 2px; + font-size: var(--theia-ui-font-size0); } .theia-scm .decoration-icon { @@ -224,48 +228,48 @@ } .scm-change-count { - float: right; + float: right; } .scm-theia-header { - display: flex; - align-items: center; + display: flex; + align-items: center; } .scm-theia-header:hover { - cursor: pointer; + cursor: pointer; } .theia-scm-inline-actions-container { - display: flex; - justify-content: flex-end; - margin-left: 3px; - min-height: 16px; + display: flex; + justify-content: flex-end; + margin-left: 3px; + min-height: 16px; } .theia-scm-inline-actions { - display: flex; - margin: 0 3px; + display: flex; + margin: 0 3px; } .theia-scm-inline-actions a { - color: var(--theia-icon-foreground); + color: var(--theia-icon-foreground); } .theia-scm-inline-action { - font-size: var(--theia-ui-font-size1); - margin: 0 2px; - cursor: pointer; - display: flex; - align-items: center; + font-size: var(--theia-ui-font-size1); + margin: 0 2px; + cursor: pointer; + display: flex; + align-items: center; } .theia-scm-inline-action .open-file { - height: var(--theia-icon-size); - width: 12px; - background: var(--theia-icon-open-file) no-repeat center center; + height: var(--theia-icon-size); + width: 12px; + background: var(--theia-icon-open-file) no-repeat center center; } .theia-scm-panel { - overflow: visible; + overflow: visible; } diff --git a/packages/scm/src/browser/style/scm-amend-component.css b/packages/scm/src/browser/style/scm-amend-component.css index 2cd72fcf8cec0..797e69baccf30 100644 --- a/packages/scm/src/browser/style/scm-amend-component.css +++ b/packages/scm/src/browser/style/scm-amend-component.css @@ -11,84 +11,84 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-scm-commit-container { - display: flex; - flex-direction: column; - border-top: 1px solid var(--theia-sideBarSectionHeader-border); - width: 100%; - padding-top: 6px; + display: flex; + flex-direction: column; + border-top: 1px solid var(--theia-sideBarSectionHeader-border); + width: 100%; + padding-top: 6px; } .theia-scm-amend-outer-container { - display: flex; - flex-direction: column; - width: 100%; - overflow: auto; + display: flex; + flex-direction: column; + width: 100%; + overflow: auto; } .theia-scm-commit-and-button { - display: flex; - white-space: nowrap; - overflow: hidden; - width: 100%; + display: flex; + white-space: nowrap; + overflow: hidden; + width: 100%; } .theia-scm-commit-avatar-and-text { - display: flex; - white-space: nowrap; - overflow: hidden; - width: 100%; - padding-top: 2px; + display: flex; + white-space: nowrap; + overflow: hidden; + width: 100%; + padding-top: 2px; } .theia-scm-commit-avatar-and-text img { - width: 27px; + width: 27px; } .theia-scm-commit-details { - display: flex; - flex-direction: column; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - width: 100%; + display: flex; + flex-direction: column; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; } .theia-scm-commit-message-avatar { - margin-right: 5px; + margin-right: 5px; } .theia-scm-commit-message-summary { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .theia-scm-commit-message-time { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - color: var(--theia-descriptionForeground); - font-size: smaller; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: var(--theia-descriptionForeground); + font-size: smaller; } .theia-scm-flex-container-center { - display: flex; - align-items: center; + display: flex; + align-items: center; } .theia-scm-scrolling-container { - position: relative; - width: 100%; - overflow: hidden; + position: relative; + width: 100%; + overflow: hidden; - margin-top: 0; - margin-bottom: 0; - padding-top: 0; - padding-bottom: 0; - border-top: 0; - border-bottom: 0; + margin-top: 0; + margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; + border-top: 0; + border-bottom: 0; } diff --git a/packages/search-in-workspace/package.json b/packages/search-in-workspace/package.json index ccd3256a4ace8..804c0a8329b2d 100644 --- a/packages/search-in-workspace/package.json +++ b/packages/search-in-workspace/package.json @@ -24,7 +24,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/search-in-workspace/src/browser/components/search-in-workspace-input.tsx b/packages/search-in-workspace/src/browser/components/search-in-workspace-input.tsx index 8018a196786a8..99b9a9e8da86d 100644 --- a/packages/search-in-workspace/src/browser/components/search-in-workspace-input.tsx +++ b/packages/search-in-workspace/src/browser/components/search-in-workspace-input.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-context-key-service.ts b/packages/search-in-workspace/src/browser/search-in-workspace-context-key-service.ts index e2c02720ff161..c5ec975125860 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-context-key-service.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-factory.ts b/packages/search-in-workspace/src/browser/search-in-workspace-factory.ts index 0ce65cff45bba..ebf9ba364eab5 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-factory.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-factory.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts index 7dfaf05a0168f..754c2020e434f 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-module.ts b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-module.ts index 39aeecdbd102e..2d250cf5de75a 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-module.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/styles/index.css'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-label-provider.ts b/packages/search-in-workspace/src/browser/search-in-workspace-label-provider.ts index b36378a0c478c..954c76f5a81d8 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-label-provider.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-label-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts b/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts index 25e5eaa498a5b..5487fdd993746 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core/lib/common/nls'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx b/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx index 1b20523f24813..7f09ac20416b3 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx +++ b/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-service.ts b/packages/search-in-workspace/src/browser/search-in-workspace-service.ts index 1ddbdee13aa34..5aed482a28b0f 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-service.ts +++ b/packages/search-in-workspace/src/browser/search-in-workspace-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-widget.tsx b/packages/search-in-workspace/src/browser/search-in-workspace-widget.tsx index f511ac0d5f1a6..9d2d6d42df0db 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-widget.tsx +++ b/packages/search-in-workspace/src/browser/search-in-workspace-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Widget, Message, BaseWidget, Key, StatefulWidget, MessageLoop, KeyCode, codicon } from '@theia/core/lib/browser'; diff --git a/packages/search-in-workspace/src/browser/search-layout-migrations.ts b/packages/search-in-workspace/src/browser/search-layout-migrations.ts index e3c5449ae91f4..69ad39d866871 100644 --- a/packages/search-in-workspace/src/browser/search-layout-migrations.ts +++ b/packages/search-in-workspace/src/browser/search-layout-migrations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/browser/styles/index.css b/packages/search-in-workspace/src/browser/styles/index.css index 97c05d86657d9..d3380da5e46f7 100644 --- a/packages/search-in-workspace/src/browser/styles/index.css +++ b/packages/search-in-workspace/src/browser/styles/index.css @@ -11,361 +11,370 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #search-in-workspace { - height: 100%; + height: 100%; } #search-in-workspace .theia-TreeContainer.empty { - overflow: hidden; + overflow: hidden; } .t-siw-search-container { - padding: 5px ; - display: flex; - flex-direction: column; - height: 100%; - box-sizing: border-box; + padding: 5px; + display: flex; + flex-direction: column; + height: 100%; + box-sizing: border-box; } .t-siw-search-container .theia-ExpansionToggle { - padding-right: 4px; - min-width: 6px; + padding-right: 4px; + min-width: 6px; } .t-siw-search-container .theia-input { - flex: 1; - line-height: var(--theia-content-line-height); - padding: 3px 0 3px 4px; + flex: 1; + line-height: var(--theia-content-line-height); + padding: 3px 0 3px 4px; } .t-siw-search-container #search-input-field:focus { - border: none; - outline: none; + border: none; + outline: none; } .t-siw-search-container #search-input-field { - background: none; - border: none; + background: none; + border: none; } .t-siw-search-container .searchHeader { - width: 100%; - margin-bottom: 10px; + width: 100%; + margin-bottom: 10px; } .t-siw-search-container .searchHeader .controls.button-container { - height: var(--theia-content-line-height); - margin-bottom: 5px; + height: var(--theia-content-line-height); + margin-bottom: 5px; } .t-siw-search-container .searchHeader .search-field-container { - background: var(--theia-input-background); - border-style: solid; - border-width: var(--theia-border-width); - border-color: var(--theia-input-background); + background: var(--theia-input-background); + border-style: solid; + border-width: var(--theia-border-width); + border-color: var(--theia-input-background); } .t-siw-search-container .searchHeader .search-field-container.focused { - border-color: var(--theia-focusBorder); + border-color: var(--theia-focusBorder); } .t-siw-search-container .searchHeader .search-field { - display: flex; - align-items: center; + display: flex; + align-items: center; } .t-siw-search-container .searchHeader .search-field:focus { - border: none; - outline: none; + border: none; + outline: none; } .t-siw-search-container .searchHeader .search-field .option { - opacity: 0.7; - cursor: pointer; + opacity: 0.7; + cursor: pointer; } .t-siw-search-container .searchHeader .search-field .option.enabled { - border: var(--theia-border-width) var(--theia-inputOption-activeBorder) solid; - background-color: var(--theia-inputOption-activeBackground); + border: var(--theia-border-width) var(--theia-inputOption-activeBorder) solid; + background-color: var(--theia-inputOption-activeBackground); } .t-siw-search-container .searchHeader .search-field .option:hover { - opacity: 1; + opacity: 1; } .t-siw-search-container .searchHeader .search-field .option-buttons { - height: 23px; - display: flex; - align-items: center; - background-color: none; + height: 23px; + display: flex; + align-items: center; + background-color: none; } .t-siw-search-container .searchHeader .search-field-container.tooManyResults { - border-style: solid; - border-width: var(--theia-border-width); - margin: -1px; - border-color: var(--theia-inputValidation-warningBorder); + border-style: solid; + border-width: var(--theia-border-width); + margin: -1px; + border-color: var(--theia-inputValidation-warningBorder); } -.t-siw-search-container .searchHeader .search-field-container .search-notification { - height: 0; - display: none; - width: 100%; - position: relative; +.t-siw-search-container + .searchHeader + .search-field-container + .search-notification { + height: 0; + display: none; + width: 100%; + position: relative; } -.t-siw-search-container .searchHeader .search-field-container.focused .search-notification.show { - display: block; +.t-siw-search-container + .searchHeader + .search-field-container.focused + .search-notification.show { + display: block; } -.t-siw-search-container .searchHeader .search-notification div{ - background-color: var(--theia-inputValidation-warningBackground); - width: calc(100% + 2px); - margin-left: -1px; - color: var(--theia-inputValidation-warningForeground); - z-index: 1000; - position: absolute; - border: 1px solid var(--theia-inputValidation-warningBorder); - box-sizing: border-box; - padding: 3px; +.t-siw-search-container .searchHeader .search-notification div { + background-color: var(--theia-inputValidation-warningBackground); + width: calc(100% + 2px); + margin-left: -1px; + color: var(--theia-inputValidation-warningForeground); + z-index: 1000; + position: absolute; + border: 1px solid var(--theia-inputValidation-warningBorder); + box-sizing: border-box; + padding: 3px; } .t-siw-search-container .searchHeader .button-container { - text-align: center; - display: flex; - justify-content: center; + text-align: center; + display: flex; + justify-content: center; } .t-siw-search-container .searchHeader .search-field .option, .t-siw-search-container .searchHeader .button-container .btn { - width: 21px; - height: 21px; - margin: 0 1px; - display: inline-block; - box-sizing: border-box; - align-items: center; - user-select: none; - background-repeat: no-repeat; - background-position: center; - border: var(--theia-border-width) solid transparent; + width: 21px; + height: 21px; + margin: 0 1px; + display: inline-block; + box-sizing: border-box; + align-items: center; + user-select: none; + background-repeat: no-repeat; + background-position: center; + border: var(--theia-border-width) solid transparent; } .t-siw-search-container .searchHeader .search-field .fa.option { - display: flex; - align-items: center; - justify-content: center; + display: flex; + align-items: center; + justify-content: center; } .t-siw-search-container .searchHeader .search-details { - position: relative; - padding-top: 5px; + position: relative; + padding-top: 5px; } .t-siw-search-container .searchHeader .search-details .button-container { - position: absolute; - width: 25px; - top:0; - right:0; - cursor: pointer; + position: absolute; + width: 25px; + top: 0; + right: 0; + cursor: pointer; } .t-siw-search-container .searchHeader .glob-field-container.hidden { - display: none; + display: none; } .t-siw-search-container .searchHeader .glob-field-container .glob-field { - margin-bottom: 8px; - margin-left: 18px; - display: flex; - flex-direction: column; + margin-bottom: 8px; + margin-left: 18px; + display: flex; + flex-direction: column; } .t-siw-search-container .searchHeader .glob-field-container .glob-field .label { - margin-bottom: 3px; - user-select: none; - font-size: var(--theia-ui-font-size0); + margin-bottom: 3px; + user-select: none; + font-size: var(--theia-ui-font-size0); } -.t-siw-search-container .searchHeader .glob-field-container .glob-field .theia-input:not(:focus)::placeholder { - color: transparent; +.t-siw-search-container + .searchHeader + .glob-field-container + .glob-field + .theia-input:not(:focus)::placeholder { + color: transparent; } .t-siw-search-container .resultContainer { - height: 100%; - margin-left: 13px; + height: 100%; + margin-left: 13px; } .t-siw-search-container .result { - overflow: hidden; - width: 100%; - flex: 1; + overflow: hidden; + width: 100%; + flex: 1; } .t-siw-search-container .result .result-head { - display:flex; + display: flex; } .t-siw-search-container .result .result-head .fa, .t-siw-search-container .result .result-head .theia-file-icons-js { - margin: 0 3px; + margin: 0 3px; } .t-siw-search-container .result .result-head .file-name { - margin-right: 5px; + margin-right: 5px; } .t-siw-search-container .result .result-head .file-path { - font-size: var(--theia-ui-font-size0); - margin-left: 3px; + font-size: var(--theia-ui-font-size0); + margin-left: 3px; } .t-siw-search-container .resultLine .match { - line-height: normal; - white-space: pre; - background: var(--theia-editor-findMatchHighlightBackground); - border: 1px solid var(--theia-editor-findMatchHighlightBorder); + line-height: normal; + white-space: pre; + background: var(--theia-editor-findMatchHighlightBackground); + border: 1px solid var(--theia-editor-findMatchHighlightBorder); } .theia-hc .t-siw-search-container .resultLine .match { - border-style: dashed; + border-style: dashed; } .t-siw-search-container .resultLine .match.strike-through { - text-decoration: line-through; - background: var(--theia-diffEditor-removedTextBackground); - border-color: var(--theia-diffEditor-removedTextBorder); + text-decoration: line-through; + background: var(--theia-diffEditor-removedTextBackground); + border-color: var(--theia-diffEditor-removedTextBorder); } .t-siw-search-container .resultLine .replace-term { - background: var(--theia-diffEditor-insertedTextBackground); - border: 1px solid var(--theia-diffEditor-insertedTextBorder); + background: var(--theia-diffEditor-insertedTextBackground); + border: 1px solid var(--theia-diffEditor-insertedTextBorder); } -.theia-hc -.t-siw-search-container .resultLine .replace-term { - border-style: dashed; +.theia-hc .t-siw-search-container .resultLine .replace-term { + border-style: dashed; } .t-siw-search-container .noWrapInfo { - width: 100%; + width: 100%; } .t-siw-search-container .result-head-info { - display: inline-flex; - align-items: center; + display: inline-flex; + align-items: center; } .search-in-workspace-editor-match { - background: var(--theia-editor-findMatchHighlightBackground); + background: var(--theia-editor-findMatchHighlightBackground); } .current-search-in-workspace-editor-match { - background: var(--theia-editor-findMatchBackground) + background: var(--theia-editor-findMatchBackground); } .current-match-range-highlight { - background: var(--theia-editor-findRangeHighlightBackground); + background: var(--theia-editor-findRangeHighlightBackground); } .result-node-buttons { - display: none; + display: none; } .theia-TreeNode:hover .result-node-buttons { - display: flex; - justify-content: flex-end; - align-items: center; - align-self: center; + display: flex; + justify-content: flex-end; + align-items: center; + align-self: center; } .theia-TreeNode:hover .result-head .notification-count-container { - display: none; + display: none; } .result-node-buttons > span { - width: 15px; - height: 15px; - margin-left: 2.5px; - margin-right: 0.5px; - background-repeat: no-repeat; - background-position: center; - background-size: contain; + width: 15px; + height: 15px; + margin-left: 2.5px; + margin-right: 0.5px; + background-repeat: no-repeat; + background-position: center; + background-size: contain; } .search-and-replace-container { - display: flex; + display: flex; } .replace-toggle { - display: flex; - align-items: center; - width: 16px; - min-width: 16px; - justify-content: center; - margin-right: 2px; - box-sizing: border-box; + display: flex; + align-items: center; + width: 16px; + min-width: 16px; + justify-content: center; + margin-right: 2px; + box-sizing: border-box; } .theia-side-panel .replace-toggle { - width: 16px; - min-width: 16px; + width: 16px; + min-width: 16px; } .theia-side-panel .replace-toggle .codicon { - padding: 0px; + padding: 0px; } .replace-toggle:hover { - background: rgba(50%, 50%, 50%, 0.2); + background: rgba(50%, 50%, 50%, 0.2); } .search-and-replace-fields { - display: flex; - flex-direction: column; - flex: 1; + display: flex; + flex-direction: column; + flex: 1; } .replace-field { - display: flex; - margin-top: 5px; + display: flex; + margin-top: 5px; } .replace-field.hidden { - display: none; + display: none; } .replace-all-button-container { - width: 25px; - display: flex; - align-items: center; - justify-content: center; + width: 25px; + display: flex; + align-items: center; + justify-content: center; } .result-node-buttons .replace-result { - background-image: var(--theia-icon-replace); + background-image: var(--theia-icon-replace); } .result-node-buttons .replace-all-result { - background-image: var(--theia-icon-replace-all); + background-image: var(--theia-icon-replace-all); } .replace-all-button-container .action-label.disabled { - opacity: var(--theia-mod-disabled-opacity); - background: transparent; - cursor: default; + opacity: var(--theia-mod-disabled-opacity); + background: transparent; + cursor: default; } .highlighted-count-container { - background-color: var(--theia-list-activeSelectionBackground); - color: var(--theia-list-activeSelectionForeground); + background-color: var(--theia-list-activeSelectionBackground); + color: var(--theia-list-activeSelectionForeground); } .t-siw-search-container .searchHeader .search-info { - color: var(--theia-descriptionForeground); - margin-left: 17px; + color: var(--theia-descriptionForeground); + margin-left: 17px; } .theia-siw-lineNumber { - opacity: .7; - padding-right: 4px; + opacity: 0.7; + padding-right: 4px; } diff --git a/packages/search-in-workspace/src/common/search-in-workspace-interface.ts b/packages/search-in-workspace/src/common/search-in-workspace-interface.ts index f60c91e2bfe44..8a9c54b75b29d 100644 --- a/packages/search-in-workspace/src/common/search-in-workspace-interface.ts +++ b/packages/search-in-workspace/src/common/search-in-workspace-interface.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core'; diff --git a/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.slow-spec.ts b/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.slow-spec.ts index f80a7bf1bc79e..b35ff8b168ba9 100644 --- a/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.slow-spec.ts +++ b/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from '@theia/core/shared/inversify'; diff --git a/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.ts b/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.ts index 5f08ac2e5ff62..499a81db50a73 100644 --- a/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.ts +++ b/packages/search-in-workspace/src/node/ripgrep-search-in-workspace-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as fs from '@theia/core/shared/fs-extra'; diff --git a/packages/search-in-workspace/src/node/search-in-workspace-backend-module.ts b/packages/search-in-workspace/src/node/search-in-workspace-backend-module.ts index 5ac59a99031f5..83339fa398bab 100644 --- a/packages/search-in-workspace/src/node/search-in-workspace-backend-module.ts +++ b/packages/search-in-workspace/src/node/search-in-workspace-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/secondary-window/package.json b/packages/secondary-window/package.json index 814d8e4e228d7..641001cafeeee 100644 --- a/packages/secondary-window/package.json +++ b/packages/secondary-window/package.json @@ -16,7 +16,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/secondary-window/src/browser/secondary-window-frontend-contribution.ts b/packages/secondary-window/src/browser/secondary-window-frontend-contribution.ts index 15c43dc002e6c..d1ba63d32cba1 100644 --- a/packages/secondary-window/src/browser/secondary-window-frontend-contribution.ts +++ b/packages/secondary-window/src/browser/secondary-window-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/secondary-window/src/browser/secondary-window-frontend-module.ts b/packages/secondary-window/src/browser/secondary-window-frontend-module.ts index 474730cb970ed..9dfd461738791 100644 --- a/packages/secondary-window/src/browser/secondary-window-frontend-module.ts +++ b/packages/secondary-window/src/browser/secondary-window-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/secondary-window/src/package.spec.ts b/packages/secondary-window/src/package.spec.ts index dc03411b1269d..df2ac30b88a02 100644 --- a/packages/secondary-window/src/package.spec.ts +++ b/packages/secondary-window/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** describe('secondary-window package', () => { diff --git a/packages/task/package.json b/packages/task/package.json index c371ee519466a..f02dba63e59db 100644 --- a/packages/task/package.json +++ b/packages/task/package.json @@ -30,7 +30,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/task/src/browser/index.ts b/packages/task/src/browser/index.ts index b7ba84c7c2ae6..3f8a8baeb5a3e 100644 --- a/packages/task/src/browser/index.ts +++ b/packages/task/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './task-service'; diff --git a/packages/task/src/browser/process/process-task-contribution.ts b/packages/task/src/browser/process/process-task-contribution.ts index e6851dd7c7302..7df7bb73d9edb 100644 --- a/packages/task/src/browser/process/process-task-contribution.ts +++ b/packages/task/src/browser/process/process-task-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/process/process-task-frontend-module.ts b/packages/task/src/browser/process/process-task-frontend-module.ts index df25c72eba644..53cc57966e104 100644 --- a/packages/task/src/browser/process/process-task-frontend-module.ts +++ b/packages/task/src/browser/process/process-task-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/process/process-task-resolver.ts b/packages/task/src/browser/process/process-task-resolver.ts index e005bf006f6f9..3bf248a7a566a 100644 --- a/packages/task/src/browser/process/process-task-resolver.ts +++ b/packages/task/src/browser/process/process-task-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/provided-task-configurations.spec.ts b/packages/task/src/browser/provided-task-configurations.spec.ts index e05dd79ce2665..76c5ad4f6377a 100644 --- a/packages/task/src/browser/provided-task-configurations.spec.ts +++ b/packages/task/src/browser/provided-task-configurations.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { assert } from 'chai'; diff --git a/packages/task/src/browser/provided-task-configurations.ts b/packages/task/src/browser/provided-task-configurations.ts index 5bcac90ea6e63..f96ee31af2c01 100644 --- a/packages/task/src/browser/provided-task-configurations.ts +++ b/packages/task/src/browser/provided-task-configurations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; @@ -106,18 +106,18 @@ export class ProvidedTaskConfigurations { protected async resolveTaskConfigurations(taskProvider: TaskProvider): Promise { return (await taskProvider.provideTasks()) - // Global/User tasks from providers are not supported. - .filter(task => task.scope !== TaskScope.Global) - .map(providedTask => { - const originalPresentation = providedTask.presentation || {}; - return { - ...providedTask, - presentation: { - ...TaskOutputPresentation.getDefault(), - ...originalPresentation - } - }; - }); + // Global/User tasks from providers are not supported. + .filter(task => task.scope !== TaskScope.Global) + .map(providedTask => { + const originalPresentation = providedTask.presentation || {}; + return { + ...providedTask, + presentation: { + ...TaskOutputPresentation.getDefault(), + ...originalPresentation + } + }; + }); } /** returns the task configuration for a given source and label or undefined if none */ diff --git a/packages/task/src/browser/quick-open-task.ts b/packages/task/src/browser/quick-open-task.ts index d4ab6e55ffea3..a16e00dead071 100644 --- a/packages/task/src/browser/quick-open-task.ts +++ b/packages/task/src/browser/quick-open-task.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from '@theia/core/shared/inversify'; @@ -271,7 +271,7 @@ export class QuickOpenTask implements QuickAccessProvider { }); } - protected async resolveItemsToConfigure(): Promise[]> { + protected async resolveItemsToConfigure(): Promise[]> { const items: Array> = []; const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened; const token: number = this.taskService.startUserAction(); diff --git a/packages/task/src/browser/style/index.css b/packages/task/src/browser/style/index.css index 687b8da4b3c86..07bb417ce4268 100644 --- a/packages/task/src/browser/style/index.css +++ b/packages/task/src/browser/style/index.css @@ -11,9 +11,9 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ - .quick-open-task-configure { - margin-top: 3px !important; +.quick-open-task-configure { + margin-top: 3px !important; } diff --git a/packages/task/src/browser/task-configuration-manager.ts b/packages/task/src/browser/task-configuration-manager.ts index 2c060d1264200..9d5da1ee1fab4 100644 --- a/packages/task/src/browser/task-configuration-manager.ts +++ b/packages/task/src/browser/task-configuration-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as jsoncparser from 'jsonc-parser'; diff --git a/packages/task/src/browser/task-configuration-model.ts b/packages/task/src/browser/task-configuration-model.ts index c0a4a762d88b7..659ed7a86ae4a 100644 --- a/packages/task/src/browser/task-configuration-model.ts +++ b/packages/task/src/browser/task-configuration-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/task/src/browser/task-configurations.ts b/packages/task/src/browser/task-configurations.ts index f44d4046c412f..dac50d6a2b4b1 100644 --- a/packages/task/src/browser/task-configurations.ts +++ b/packages/task/src/browser/task-configurations.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-contribution.ts b/packages/task/src/browser/task-contribution.ts index d3673295bf511..1ee78b7cba232 100644 --- a/packages/task/src/browser/task-contribution.ts +++ b/packages/task/src/browser/task-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-definition-registry.spec.ts b/packages/task/src/browser/task-definition-registry.spec.ts index e197e7e07faef..91db4dec1be6a 100644 --- a/packages/task/src/browser/task-definition-registry.spec.ts +++ b/packages/task/src/browser/task-definition-registry.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/task/src/browser/task-definition-registry.ts b/packages/task/src/browser/task-definition-registry.ts index f07225dcb9ef1..2c80374a13a85 100644 --- a/packages/task/src/browser/task-definition-registry.ts +++ b/packages/task/src/browser/task-definition-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-frontend-contribution.ts b/packages/task/src/browser/task-frontend-contribution.ts index c7b0bcddc3a56..c16b823934b28 100644 --- a/packages/task/src/browser/task-frontend-contribution.ts +++ b/packages/task/src/browser/task-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-frontend-module.ts b/packages/task/src/browser/task-frontend-module.ts index befeaf4a8eaa6..fd3c679169f29 100644 --- a/packages/task/src/browser/task-frontend-module.ts +++ b/packages/task/src/browser/task-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-name-resolver.ts b/packages/task/src/browser/task-name-resolver.ts index 102783d150a33..12e2322ddbd79 100644 --- a/packages/task/src/browser/task-name-resolver.ts +++ b/packages/task/src/browser/task-name-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-node.ts b/packages/task/src/browser/task-node.ts index e543693c351f8..20c1134bc1d51 100644 --- a/packages/task/src/browser/task-node.ts +++ b/packages/task/src/browser/task-node.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TaskConfiguration } from '../common'; diff --git a/packages/task/src/browser/task-preferences.ts b/packages/task/src/browser/task-preferences.ts index aa9646f3884ea..59f63f689232a 100644 --- a/packages/task/src/browser/task-preferences.ts +++ b/packages/task/src/browser/task-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-problem-matcher-registry.ts b/packages/task/src/browser/task-problem-matcher-registry.ts index 99d86a6c40278..63e05e26334e0 100644 --- a/packages/task/src/browser/task-problem-matcher-registry.ts +++ b/packages/task/src/browser/task-problem-matcher-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/task/src/browser/task-problem-pattern-registry.ts b/packages/task/src/browser/task-problem-pattern-registry.ts index 98281699598a9..4c03c330bfaa3 100644 --- a/packages/task/src/browser/task-problem-pattern-registry.ts +++ b/packages/task/src/browser/task-problem-pattern-registry.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/task/src/browser/task-schema-updater.ts b/packages/task/src/browser/task-schema-updater.ts index 408bf481ec55c..ad5231af090cf 100644 --- a/packages/task/src/browser/task-schema-updater.ts +++ b/packages/task/src/browser/task-schema-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // This file is inspired by VSCode and partially copied from https://github.com/Microsoft/vscode/blob/1.33.1/src/vs/workbench/contrib/tasks/common/problemMatcher.ts // 'problemMatcher.ts' copyright: diff --git a/packages/task/src/browser/task-service.ts b/packages/task/src/browser/task-service.ts index 3be2abe584e98..5cbe911a62a56 100644 --- a/packages/task/src/browser/task-service.ts +++ b/packages/task/src/browser/task-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ApplicationShell, FrontendApplication, QuickPickValue, WidgetManager, WidgetOpenMode } from '@theia/core/lib/browser'; @@ -98,7 +98,7 @@ export class TaskService implements TaskConfigurationClient { /** * The last executed task. */ - protected lastTask: LastRunTaskInfo = {resolvedTask: undefined, option: undefined}; + protected lastTask: LastRunTaskInfo = { resolvedTask: undefined, option: undefined }; protected cachedRecentTasks: TaskConfiguration[] = []; protected runningTasks = new Map, @@ -997,7 +997,7 @@ export class TaskService implements TaskConfigurationClient { let taskInfo: TaskInfo | undefined; try { taskInfo = await this.taskServer.run(resolvedTask, this.getContext(), option); - this.lastTask = {resolvedTask, option }; + this.lastTask = { resolvedTask, option }; this.logger.debug(`Task created. Task id: ${taskInfo.taskId}`); /** diff --git a/packages/task/src/browser/task-source-resolver.ts b/packages/task/src/browser/task-source-resolver.ts index 0f54346698089..421de8ef0add1 100644 --- a/packages/task/src/browser/task-source-resolver.ts +++ b/packages/task/src/browser/task-source-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/task-templates.ts b/packages/task/src/browser/task-templates.ts index 584cb99b827e7..da6f9e609868c 100644 --- a/packages/task/src/browser/task-templates.ts +++ b/packages/task/src/browser/task-templates.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/task/src/browser/task-terminal-widget-manager.ts b/packages/task/src/browser/task-terminal-widget-manager.ts index 9a353b6888919..f14a6b4b8f85a 100644 --- a/packages/task/src/browser/task-terminal-widget-manager.ts +++ b/packages/task/src/browser/task-terminal-widget-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/browser/tasks-monaco-contribution.ts b/packages/task/src/browser/tasks-monaco-contribution.ts index 752affb6c993c..6c938627595ae 100644 --- a/packages/task/src/browser/tasks-monaco-contribution.ts +++ b/packages/task/src/browser/tasks-monaco-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as monaco from '@theia/monaco-editor-core'; diff --git a/packages/task/src/common/index.ts b/packages/task/src/common/index.ts index eb660707a2d2e..d44cfdac92e1b 100644 --- a/packages/task/src/common/index.ts +++ b/packages/task/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './task-protocol'; diff --git a/packages/task/src/common/problem-matcher-protocol.ts b/packages/task/src/common/problem-matcher-protocol.ts index aa13dce3419a7..df69afacf746c 100644 --- a/packages/task/src/common/problem-matcher-protocol.ts +++ b/packages/task/src/common/problem-matcher-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // This file is inspired by VSCode https://github.com/Microsoft/vscode/blob/1.33.1/src/vs/workbench/contrib/tasks/common/problemMatcher.ts diff --git a/packages/task/src/common/process/task-protocol.ts b/packages/task/src/common/process/task-protocol.ts index 8ede64a751651..aa085e1b3f47e 100644 --- a/packages/task/src/common/process/task-protocol.ts +++ b/packages/task/src/common/process/task-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TaskConfiguration, TaskInfo } from '../task-protocol'; diff --git a/packages/task/src/common/task-common-module.ts b/packages/task/src/common/task-common-module.ts index 742987bb65da7..eeffccb384efc 100644 --- a/packages/task/src/common/task-common-module.ts +++ b/packages/task/src/common/task-common-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/common/task-protocol.ts b/packages/task/src/common/task-protocol.ts index 439a79a848d08..2d191dd47cd9b 100644 --- a/packages/task/src/common/task-protocol.ts +++ b/packages/task/src/common/task-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event } from '@theia/core'; diff --git a/packages/task/src/common/task-watcher.ts b/packages/task/src/common/task-watcher.ts index 1299f45de2830..01c54f5ccf206 100644 --- a/packages/task/src/common/task-watcher.ts +++ b/packages/task/src/common/task-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/custom/custom-task-runner-backend-module.ts b/packages/task/src/node/custom/custom-task-runner-backend-module.ts index a5f97df95d0c6..b2ca94e4e3006 100644 --- a/packages/task/src/node/custom/custom-task-runner-backend-module.ts +++ b/packages/task/src/node/custom/custom-task-runner-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/custom/custom-task-runner-contribution.ts b/packages/task/src/node/custom/custom-task-runner-contribution.ts index 627b839fbf33b..ff294962343ca 100644 --- a/packages/task/src/node/custom/custom-task-runner-contribution.ts +++ b/packages/task/src/node/custom/custom-task-runner-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/custom/custom-task-runner.ts b/packages/task/src/node/custom/custom-task-runner.ts index 360779fb85689..d86ea4bbb0b71 100644 --- a/packages/task/src/node/custom/custom-task-runner.ts +++ b/packages/task/src/node/custom/custom-task-runner.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TaskConfiguration } from '../../common'; diff --git a/packages/task/src/node/custom/custom-task.ts b/packages/task/src/node/custom/custom-task.ts index f24af6c61743a..9423d80c1aa1a 100644 --- a/packages/task/src/node/custom/custom-task.ts +++ b/packages/task/src/node/custom/custom-task.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/index.ts b/packages/task/src/node/index.ts index 91e56240f0b40..291954ee84bd4 100644 --- a/packages/task/src/node/index.ts +++ b/packages/task/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './task'; diff --git a/packages/task/src/node/process/process-task-runner-backend-module.ts b/packages/task/src/node/process/process-task-runner-backend-module.ts index 8e00a730fa7b5..9bd0e0a6fda36 100644 --- a/packages/task/src/node/process/process-task-runner-backend-module.ts +++ b/packages/task/src/node/process/process-task-runner-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/process/process-task-runner-contribution.ts b/packages/task/src/node/process/process-task-runner-contribution.ts index d73e6729e90f6..4fbd902ec4735 100644 --- a/packages/task/src/node/process/process-task-runner-contribution.ts +++ b/packages/task/src/node/process/process-task-runner-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/process/process-task-runner.ts b/packages/task/src/node/process/process-task-runner.ts index f7b82f75b6e6f..442b18675df40 100644 --- a/packages/task/src/node/process/process-task-runner.ts +++ b/packages/task/src/node/process/process-task-runner.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/task/src/node/process/process-task.spec.ts b/packages/task/src/node/process/process-task.spec.ts index c8077c13bda75..ea0e08262bad6 100644 --- a/packages/task/src/node/process/process-task.spec.ts +++ b/packages/task/src/node/process/process-task.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/task/src/node/process/process-task.ts b/packages/task/src/node/process/process-task.ts index 3229831843608..b8adfd3d516a2 100644 --- a/packages/task/src/node/process/process-task.ts +++ b/packages/task/src/node/process/process-task.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/task/src/node/task-abstract-line-matcher.ts b/packages/task/src/node/task-abstract-line-matcher.ts index 8ca63972bb304..a4c650a730b6e 100644 --- a/packages/task/src/node/task-abstract-line-matcher.ts +++ b/packages/task/src/node/task-abstract-line-matcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/task/src/node/task-backend-application-contribution.ts b/packages/task/src/node/task-backend-application-contribution.ts index c2f30e1fa9bd6..f1ff4ee293a22 100644 --- a/packages/task/src/node/task-backend-application-contribution.ts +++ b/packages/task/src/node/task-backend-application-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/task-backend-module.ts b/packages/task/src/node/task-backend-module.ts index 140a9314515b8..fd2568b70afff 100644 --- a/packages/task/src/node/task-backend-module.ts +++ b/packages/task/src/node/task-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/task-line-matchers.ts b/packages/task/src/node/task-line-matchers.ts index ce2a9b6cc7019..c044096f48f0f 100644 --- a/packages/task/src/node/task-line-matchers.ts +++ b/packages/task/src/node/task-line-matchers.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AbstractLineMatcher } from './task-abstract-line-matcher'; diff --git a/packages/task/src/node/task-manager.ts b/packages/task/src/node/task-manager.ts index dc4428ad21100..bcdb9855f0d51 100644 --- a/packages/task/src/node/task-manager.ts +++ b/packages/task/src/node/task-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; import { Emitter, Event, ILogger } from '@theia/core/lib/common'; diff --git a/packages/task/src/node/task-problem-collector.spec.ts b/packages/task/src/node/task-problem-collector.spec.ts index 18ef175772ba0..c86c62fb22fa8 100644 --- a/packages/task/src/node/task-problem-collector.spec.ts +++ b/packages/task/src/node/task-problem-collector.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { expect } from 'chai'; diff --git a/packages/task/src/node/task-problem-collector.ts b/packages/task/src/node/task-problem-collector.ts index d1df9533d5f10..7046914e82ad8 100644 --- a/packages/task/src/node/task-problem-collector.ts +++ b/packages/task/src/node/task-problem-collector.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { AbstractLineMatcher } from './task-abstract-line-matcher'; diff --git a/packages/task/src/node/task-runner-protocol.ts b/packages/task/src/node/task-runner-protocol.ts index bd31a42653a1d..5368ba5bbaeb2 100644 --- a/packages/task/src/node/task-runner-protocol.ts +++ b/packages/task/src/node/task-runner-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TaskConfiguration } from '../common'; diff --git a/packages/task/src/node/task-runner.ts b/packages/task/src/node/task-runner.ts index 4255ed4b36c70..8b3df8223b814 100644 --- a/packages/task/src/node/task-runner.ts +++ b/packages/task/src/node/task-runner.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/task-server.slow-spec.ts b/packages/task/src/node/task-server.slow-spec.ts index 9a1c134501671..03749c9d2f2aa 100644 --- a/packages/task/src/node/task-server.slow-spec.ts +++ b/packages/task/src/node/task-server.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // tslint:disable-next-line:no-implicit-dependencies diff --git a/packages/task/src/node/task-server.ts b/packages/task/src/node/task-server.ts index d4c3822ca3fe7..7f90bcaa25f06 100644 --- a/packages/task/src/node/task-server.ts +++ b/packages/task/src/node/task-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/task.ts b/packages/task/src/node/task.ts index 10a243aefa0cb..dc1bcaca938ba 100644 --- a/packages/task/src/node/task.ts +++ b/packages/task/src/node/task.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/task/src/node/test/task-test-container.ts b/packages/task/src/node/test/task-test-container.ts index f6a207a0e659c..ccee656d3c050 100644 --- a/packages/task/src/node/test/task-test-container.ts +++ b/packages/task/src/node/test/task-test-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from '@theia/core/shared/inversify'; import { bindLogger } from '@theia/core/lib/node/logger-backend-module'; diff --git a/packages/terminal/package.json b/packages/terminal/package.json index 5e8fb957f21a0..9aa89a0bc936b 100644 --- a/packages/terminal/package.json +++ b/packages/terminal/package.json @@ -26,7 +26,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/terminal/src/browser/base/terminal-service.ts b/packages/terminal/src/browser/base/terminal-service.ts index db0094abd6ea7..02f8e17ec4e68 100644 --- a/packages/terminal/src/browser/base/terminal-service.ts +++ b/packages/terminal/src/browser/base/terminal-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event } from '@theia/core/lib/common/event'; import { WidgetOpenerOptions } from '@theia/core/lib/browser'; diff --git a/packages/terminal/src/browser/base/terminal-widget.ts b/packages/terminal/src/browser/base/terminal-widget.ts index 897ed69355cc5..f5a5497fdc84c 100644 --- a/packages/terminal/src/browser/base/terminal-widget.ts +++ b/packages/terminal/src/browser/base/terminal-widget.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Event, ViewColumn } from '@theia/core'; diff --git a/packages/terminal/src/browser/index.ts b/packages/terminal/src/browser/index.ts index ccfaa5f6505cb..a5fbc0a9d0f6d 100644 --- a/packages/terminal/src/browser/index.ts +++ b/packages/terminal/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './terminal-frontend-module'; diff --git a/packages/terminal/src/browser/search/terminal-search-container.ts b/packages/terminal/src/browser/search/terminal-search-container.ts index 20d39fecc1846..3831bc3a4f7e9 100644 --- a/packages/terminal/src/browser/search/terminal-search-container.ts +++ b/packages/terminal/src/browser/search/terminal-search-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/search/terminal-search-widget.tsx b/packages/terminal/src/browser/search/terminal-search-widget.tsx index ff47847e01999..82fe72dcd40e7 100644 --- a/packages/terminal/src/browser/search/terminal-search-widget.tsx +++ b/packages/terminal/src/browser/search/terminal-search-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/shell-terminal-profile.ts b/packages/terminal/src/browser/shell-terminal-profile.ts index 44e7da3433ac7..aaefd630bd67d 100644 --- a/packages/terminal/src/browser/shell-terminal-profile.ts +++ b/packages/terminal/src/browser/shell-terminal-profile.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { URI } from '@theia/core'; diff --git a/packages/terminal/src/browser/style/terminal-search.css b/packages/terminal/src/browser/style/terminal-search.css index a5868a5f57f4a..3501d948ff403 100644 --- a/packages/terminal/src/browser/style/terminal-search.css +++ b/packages/terminal/src/browser/style/terminal-search.css @@ -11,83 +11,89 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-search-terminal-widget-parent { - background: var(--theia-sideBar-background); - position: absolute; - margin: 0px; - border: var(--theia-border-width) solid transparent; - padding: 0px; - top: 1px; - right: 19px; + background: var(--theia-sideBar-background); + position: absolute; + margin: 0px; + border: var(--theia-border-width) solid transparent; + padding: 0px; + top: 1px; + right: 19px; - z-index: 10; + z-index: 10; } .theia-search-terminal-widget-parent .theia-search-elem-box { - display: flex; - margin: 0px; - border: var(--theia-border-width) solid transparent; - padding: 0px; - align-items: center; - color: var(--theia-input-foreground); - background: var(--theia-input-background); + display: flex; + margin: 0px; + border: var(--theia-border-width) solid transparent; + padding: 0px; + align-items: center; + color: var(--theia-input-foreground); + background: var(--theia-input-background); } .theia-search-terminal-widget-parent .theia-search-elem-box input { - margin-left: 5px; - padding: 0px; - width: 100px; - height: 18px; - color: inherit; - background-color: inherit; - border: var(--theia-border-width) solid transparent; - outline: none; + margin-left: 5px; + padding: 0px; + width: 100px; + height: 18px; + color: inherit; + background-color: inherit; + border: var(--theia-border-width) solid transparent; + outline: none; } -.theia-search-terminal-widget-parent .theia-search-elem-box .search-elem.codicon { - height: 16px; - width: 18px; +.theia-search-terminal-widget-parent + .theia-search-elem-box + .search-elem.codicon { + height: 16px; + width: 18px; } .theia-search-terminal-widget-parent .search-elem.codicon { - border: var(--theia-border-width) solid transparent; - height: 20px; - width: 20px; - opacity: 0.7; - outline: none; - color: var(--theia-input-foreground); - padding: 0px; - margin-left: 3px; + border: var(--theia-border-width) solid transparent; + height: 20px; + width: 20px; + opacity: 0.7; + outline: none; + color: var(--theia-input-foreground); + padding: 0px; + margin-left: 3px; } .theia-search-terminal-widget-parent .search-elem:hover { - opacity: 1; + opacity: 1; } .theia-search-terminal-widget-parent .theia-search-elem-box.focused { - border: var(--theia-border-width) solid var(--theia-focusBorder); + border: var(--theia-border-width) solid var(--theia-focusBorder); } -.theia-search-terminal-widget-parent .theia-search-elem-box .search-elem.option-enabled { - border: var(--theia-border-width) solid var(--theia-inputOption-activeBorder); - background-color: var(--theia-inputOption-activeBackground); +.theia-search-terminal-widget-parent + .theia-search-elem-box + .search-elem.option-enabled { + border: var(--theia-border-width) solid var(--theia-inputOption-activeBorder); + background-color: var(--theia-inputOption-activeBackground); } .theia-search-terminal-widget-parent .theia-search-terminal-widget { - margin: 2px; - display: flex; - align-items: center; - font: var(--theia-content-font-size); - color: var(--theia-input-foreground); + margin: 2px; + display: flex; + align-items: center; + font: var(--theia-content-font-size); + color: var(--theia-input-foreground); } .theia-search-terminal-widget-parent .theia-search-terminal-widget button { - background-color: transparent; + background-color: transparent; } -.theia-search-terminal-widget-parent .theia-search-terminal-widget button:focus { - border: var(--theia-border-width) var(--theia-focusBorder) solid; +.theia-search-terminal-widget-parent + .theia-search-terminal-widget + button:focus { + border: var(--theia-border-width) var(--theia-focusBorder) solid; } diff --git a/packages/terminal/src/browser/style/terminal.css b/packages/terminal/src/browser/style/terminal.css index 39e087fab9492..721d198a3f3f5 100644 --- a/packages/terminal/src/browser/style/terminal.css +++ b/packages/terminal/src/browser/style/terminal.css @@ -11,14 +11,14 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .terminal-container { - width:100%; - height:100%; - padding: var(--theia-code-padding); - background: var(--theia-terminal-background); + width: 100%; + height: 100%; + padding: var(--theia-code-padding); + background: var(--theia-terminal-background); } .xterm .xterm-screen canvas { @@ -26,7 +26,6 @@ border: 1px solid var(--theia-terminal-background); } - .terminal-container .xterm .xterm-helper-textarea { /* fix secondary cursor-like issue. See https://github.com/eclipse-theia/theia/issues/8158 */ opacity: 0 !important; diff --git a/packages/terminal/src/browser/terminal-contribution.ts b/packages/terminal/src/browser/terminal-contribution.ts index 56bac3fd9d600..ab668730cc370 100644 --- a/packages/terminal/src/browser/terminal-contribution.ts +++ b/packages/terminal/src/browser/terminal-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { TerminalContribution } from './terminal-widget-impl'; diff --git a/packages/terminal/src/browser/terminal-copy-on-selection-handler.ts b/packages/terminal/src/browser/terminal-copy-on-selection-handler.ts index b14e93e3881ec..d5f7cfd14b470 100644 --- a/packages/terminal/src/browser/terminal-copy-on-selection-handler.ts +++ b/packages/terminal/src/browser/terminal-copy-on-selection-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/terminal-file-link-provider.ts b/packages/terminal/src/browser/terminal-file-link-provider.ts index 4f722a443fd19..5ee6feefe7ffa 100644 --- a/packages/terminal/src/browser/terminal-file-link-provider.ts +++ b/packages/terminal/src/browser/terminal-file-link-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { OS, Path } from '@theia/core'; diff --git a/packages/terminal/src/browser/terminal-frontend-contribution.ts b/packages/terminal/src/browser/terminal-frontend-contribution.ts index c5c158fedd6db..055992fe8d3d5 100644 --- a/packages/terminal/src/browser/terminal-frontend-contribution.ts +++ b/packages/terminal/src/browser/terminal-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/terminal-frontend-module.ts b/packages/terminal/src/browser/terminal-frontend-module.ts index bcc0452c38510..c935e71138471 100644 --- a/packages/terminal/src/browser/terminal-frontend-module.ts +++ b/packages/terminal/src/browser/terminal-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/terminal.css'; diff --git a/packages/terminal/src/browser/terminal-keybinding-contexts.ts b/packages/terminal/src/browser/terminal-keybinding-contexts.ts index 6176ff9fc3a3f..715b1a5371869 100644 --- a/packages/terminal/src/browser/terminal-keybinding-contexts.ts +++ b/packages/terminal/src/browser/terminal-keybinding-contexts.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/terminal-link-helpers.ts b/packages/terminal/src/browser/terminal-link-helpers.ts index 9dac2aaf3399e..752b0fd7a7554 100644 --- a/packages/terminal/src/browser/terminal-link-helpers.ts +++ b/packages/terminal/src/browser/terminal-link-helpers.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import type { IBufferRange, IBufferLine, IBuffer, Terminal } from 'xterm'; diff --git a/packages/terminal/src/browser/terminal-link-provider.ts b/packages/terminal/src/browser/terminal-link-provider.ts index 41d199b9231a7..d6db9be69dfea 100644 --- a/packages/terminal/src/browser/terminal-link-provider.ts +++ b/packages/terminal/src/browser/terminal-link-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CancellationToken, ContributionProvider, DisposableCollection, disposableTimeout, isOSX } from '@theia/core'; diff --git a/packages/terminal/src/browser/terminal-preferences.ts b/packages/terminal/src/browser/terminal-preferences.ts index 9278977069d99..c0f106086e6c9 100644 --- a/packages/terminal/src/browser/terminal-preferences.ts +++ b/packages/terminal/src/browser/terminal-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable max-len */ diff --git a/packages/terminal/src/browser/terminal-profile-service.ts b/packages/terminal/src/browser/terminal-profile-service.ts index 30f60f859ba8b..5d8094ce24021 100644 --- a/packages/terminal/src/browser/terminal-profile-service.ts +++ b/packages/terminal/src/browser/terminal-profile-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter, Event } from '@theia/core'; diff --git a/packages/terminal/src/browser/terminal-quick-open-service.ts b/packages/terminal/src/browser/terminal-quick-open-service.ts index cf2641ce4e337..071057e3d2646 100644 --- a/packages/terminal/src/browser/terminal-quick-open-service.ts +++ b/packages/terminal/src/browser/terminal-quick-open-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/terminal-theme-service.ts b/packages/terminal/src/browser/terminal-theme-service.ts index 6e68d27166b36..3603f8f30f643 100644 --- a/packages/terminal/src/browser/terminal-theme-service.ts +++ b/packages/terminal/src/browser/terminal-theme-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ITheme } from 'xterm'; diff --git a/packages/terminal/src/browser/terminal-url-link-provider.ts b/packages/terminal/src/browser/terminal-url-link-provider.ts index 5da44e4d65821..581df1c29d21f 100644 --- a/packages/terminal/src/browser/terminal-url-link-provider.ts +++ b/packages/terminal/src/browser/terminal-url-link-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/browser/terminal-widget-impl.ts b/packages/terminal/src/browser/terminal-widget-impl.ts index 45d64ba7316fd..ae3d9fbf8a01c 100644 --- a/packages/terminal/src/browser/terminal-widget-impl.ts +++ b/packages/terminal/src/browser/terminal-widget-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Terminal, RendererType } from 'xterm'; diff --git a/packages/terminal/src/common/base-terminal-protocol.ts b/packages/terminal/src/common/base-terminal-protocol.ts index 57dc52a05dd80..d328ba656f611 100644 --- a/packages/terminal/src/common/base-terminal-protocol.ts +++ b/packages/terminal/src/common/base-terminal-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory'; diff --git a/packages/terminal/src/common/shell-terminal-protocol.ts b/packages/terminal/src/common/shell-terminal-protocol.ts index 920ca9bb81c1b..994227d244df6 100644 --- a/packages/terminal/src/common/shell-terminal-protocol.ts +++ b/packages/terminal/src/common/shell-terminal-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { JsonRpcProxy } from '@theia/core'; diff --git a/packages/terminal/src/common/terminal-common-module.ts b/packages/terminal/src/common/terminal-common-module.ts index 09a070117bb2d..52b5539b3d302 100644 --- a/packages/terminal/src/common/terminal-common-module.ts +++ b/packages/terminal/src/common/terminal-common-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/common/terminal-protocol.ts b/packages/terminal/src/common/terminal-protocol.ts index 2ee132f8945e7..58a969fd876c3 100644 --- a/packages/terminal/src/common/terminal-protocol.ts +++ b/packages/terminal/src/common/terminal-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol'; diff --git a/packages/terminal/src/common/terminal-watcher.ts b/packages/terminal/src/common/terminal-watcher.ts index 3947401435f30..c169e339365c9 100644 --- a/packages/terminal/src/common/terminal-watcher.ts +++ b/packages/terminal/src/common/terminal-watcher.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/base-terminal-server.ts b/packages/terminal/src/node/base-terminal-server.ts index 0a3dbcc5ddb14..786ebb440f47e 100644 --- a/packages/terminal/src/node/base-terminal-server.ts +++ b/packages/terminal/src/node/base-terminal-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/buffering-stream.spec.ts b/packages/terminal/src/node/buffering-stream.spec.ts index 6d54dfbd8f324..9abc0d86c60d9 100644 --- a/packages/terminal/src/node/buffering-stream.spec.ts +++ b/packages/terminal/src/node/buffering-stream.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { wait } from '@theia/core/lib/common/promise-util'; diff --git a/packages/terminal/src/node/buffering-stream.ts b/packages/terminal/src/node/buffering-stream.ts index 46bec4bb9a260..47519b329afc2 100644 --- a/packages/terminal/src/node/buffering-stream.ts +++ b/packages/terminal/src/node/buffering-stream.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Emitter, Event } from '@theia/core/lib/common/event'; diff --git a/packages/terminal/src/node/index.ts b/packages/terminal/src/node/index.ts index d446f36e097c6..769ec56ed188e 100644 --- a/packages/terminal/src/node/index.ts +++ b/packages/terminal/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './terminal-backend-module'; diff --git a/packages/terminal/src/node/shell-process.ts b/packages/terminal/src/node/shell-process.ts index b2a87a5a8c8ae..971d4d4c24c84 100644 --- a/packages/terminal/src/node/shell-process.ts +++ b/packages/terminal/src/node/shell-process.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/shell-terminal-server.spec.ts b/packages/terminal/src/node/shell-terminal-server.spec.ts index f2aae99706a78..f0795d4da334d 100644 --- a/packages/terminal/src/node/shell-terminal-server.spec.ts +++ b/packages/terminal/src/node/shell-terminal-server.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; import { createTerminalTestContainer } from './test/terminal-test-container'; diff --git a/packages/terminal/src/node/shell-terminal-server.ts b/packages/terminal/src/node/shell-terminal-server.ts index 58e5d2024422f..543c5cf4badf7 100644 --- a/packages/terminal/src/node/shell-terminal-server.ts +++ b/packages/terminal/src/node/shell-terminal-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/terminal-backend-contribution.slow-spec.ts b/packages/terminal/src/node/terminal-backend-contribution.slow-spec.ts index aa4a54e72deff..cf9defadd94a9 100644 --- a/packages/terminal/src/node/terminal-backend-contribution.slow-spec.ts +++ b/packages/terminal/src/node/terminal-backend-contribution.slow-spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { createTerminalTestContainer } from './test/terminal-test-container'; diff --git a/packages/terminal/src/node/terminal-backend-contribution.ts b/packages/terminal/src/node/terminal-backend-contribution.ts index d5d45ed9e8d8a..d538ff697bd62 100644 --- a/packages/terminal/src/node/terminal-backend-contribution.ts +++ b/packages/terminal/src/node/terminal-backend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/terminal-backend-module.ts b/packages/terminal/src/node/terminal-backend-module.ts index fcf57e944e989..2bd9b3025d417 100644 --- a/packages/terminal/src/node/terminal-backend-module.ts +++ b/packages/terminal/src/node/terminal-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, Container, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/terminal-server.spec.ts b/packages/terminal/src/node/terminal-server.spec.ts index b43b04334a975..16e815d22d73c 100644 --- a/packages/terminal/src/node/terminal-server.spec.ts +++ b/packages/terminal/src/node/terminal-server.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/terminal/src/node/terminal-server.ts b/packages/terminal/src/node/terminal-server.ts index 754871c9b5af3..c1f58ad4d1df9 100644 --- a/packages/terminal/src/node/terminal-server.ts +++ b/packages/terminal/src/node/terminal-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, named } from '@theia/core/shared/inversify'; diff --git a/packages/terminal/src/node/test/terminal-test-container.ts b/packages/terminal/src/node/test/terminal-test-container.ts index e781f91a1eb58..95ea288424fb0 100644 --- a/packages/terminal/src/node/test/terminal-test-container.ts +++ b/packages/terminal/src/node/test/terminal-test-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from '@theia/core/shared/inversify'; import { bindLogger } from '@theia/core/lib/node/logger-backend-module'; diff --git a/packages/terminal/src/package.spec.ts b/packages/terminal/src/package.spec.ts index 94c498cf7810a..7bc3187d815fc 100644 --- a/packages/terminal/src/package.spec.ts +++ b/packages/terminal/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/timeline/package.json b/packages/timeline/package.json index c211788e5be41..6bd5e1de4973f 100644 --- a/packages/timeline/package.json +++ b/packages/timeline/package.json @@ -17,7 +17,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/timeline/src/browser/style/index.css b/packages/timeline/src/browser/style/index.css index 933ce724d993b..a3d0c8cd078af 100644 --- a/packages/timeline/src/browser/style/index.css +++ b/packages/timeline/src/browser/style/index.css @@ -11,41 +11,39 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ - .theia-timeline { - box-sizing: border-box; - height: 100%; - display: flex; - flex-direction: column; + box-sizing: border-box; + height: 100%; + display: flex; + flex-direction: column; } .theia-timeline .timeline-outer-container { - overflow-y: auto; - width: 100%; - flex-grow: 1; + overflow-y: auto; + width: 100%; + flex-grow: 1; } - .theia-timeline .timeline-item { - font-size: var(--theia-ui-font-size1); - display: flex; - overflow: hidden; - align-items: center; - justify-content: space-between; - height: var(--theia-content-line-height); - line-height: var(--theia-content-line-height); - padding: 0px calc(var(--theia-ui-padding)/2); + font-size: var(--theia-ui-font-size1); + display: flex; + overflow: hidden; + align-items: center; + justify-content: space-between; + height: var(--theia-content-line-height); + line-height: var(--theia-content-line-height); + padding: 0px calc(var(--theia-ui-padding) / 2); } .theia-timeline .timeline-item:hover { - cursor: pointer; + cursor: pointer; } .theia-timeline .timeline-item .label { - font-size: var(--theia-ui-font-size0); - margin-left: var(--theia-ui-padding); - opacity: .7; + font-size: var(--theia-ui-font-size0); + margin-left: var(--theia-ui-padding); + opacity: 0.7; } diff --git a/packages/timeline/src/browser/timeline-context-key-service.ts b/packages/timeline/src/browser/timeline-context-key-service.ts index 839c4a3d87cd3..5fb8e44874040 100644 --- a/packages/timeline/src/browser/timeline-context-key-service.ts +++ b/packages/timeline/src/browser/timeline-context-key-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-contribution.ts b/packages/timeline/src/browser/timeline-contribution.ts index dbb201a884878..cf84ab27f40cf 100644 --- a/packages/timeline/src/browser/timeline-contribution.ts +++ b/packages/timeline/src/browser/timeline-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-empty-widget.tsx b/packages/timeline/src/browser/timeline-empty-widget.tsx index c20bbb16fdc07..30b43d08eb33c 100644 --- a/packages/timeline/src/browser/timeline-empty-widget.tsx +++ b/packages/timeline/src/browser/timeline-empty-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-frontend-module.ts b/packages/timeline/src/browser/timeline-frontend-module.ts index c11cf4d8ce113..6f5dd1c235057 100644 --- a/packages/timeline/src/browser/timeline-frontend-module.ts +++ b/packages/timeline/src/browser/timeline-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container, ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-service.ts b/packages/timeline/src/browser/timeline-service.ts index 6dc61fdf23d6c..cc2e13b756971 100644 --- a/packages/timeline/src/browser/timeline-service.ts +++ b/packages/timeline/src/browser/timeline-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-tree-model.ts b/packages/timeline/src/browser/timeline-tree-model.ts index 6db4d07703644..53d8f7a1ae904 100644 --- a/packages/timeline/src/browser/timeline-tree-model.ts +++ b/packages/timeline/src/browser/timeline-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-tree-widget.tsx b/packages/timeline/src/browser/timeline-tree-widget.tsx index f2f87d2947636..77c20e4dd7ac4 100644 --- a/packages/timeline/src/browser/timeline-tree-widget.tsx +++ b/packages/timeline/src/browser/timeline-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/timeline/src/browser/timeline-widget.tsx b/packages/timeline/src/browser/timeline-widget.tsx index 9e46eecc969fb..6c125ef6a611f 100644 --- a/packages/timeline/src/browser/timeline-widget.tsx +++ b/packages/timeline/src/browser/timeline-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Message } from '@theia/core/shared/@phosphor/messaging'; diff --git a/packages/timeline/src/common/timeline-model.ts b/packages/timeline/src/common/timeline-model.ts index a081bcea26d3f..c2bb72e31111d 100644 --- a/packages/timeline/src/common/timeline-model.ts +++ b/packages/timeline/src/common/timeline-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- diff --git a/packages/timeline/src/package.spec.ts b/packages/timeline/src/package.spec.ts index e34d52b29b83d..bd7240108ba28 100644 --- a/packages/timeline/src/package.spec.ts +++ b/packages/timeline/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/toolbar/fetch-icons.js b/packages/toolbar/fetch-icons.js index cd9dbc6c006b5..feb29043729d7 100644 --- a/packages/toolbar/fetch-icons.js +++ b/packages/toolbar/fetch-icons.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const fs = require('fs'); diff --git a/packages/toolbar/package.json b/packages/toolbar/package.json index ef4808b9b6712..9635305c99046 100644 --- a/packages/toolbar/package.json +++ b/packages/toolbar/package.json @@ -6,7 +6,7 @@ "theia-extension" ], "homepage": "https://github.com/eclipse-theia/theia", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/toolbar/src/browser/abstract-toolbar-contribution.tsx b/packages/toolbar/src/browser/abstract-toolbar-contribution.tsx index a76e6f7d7d818..92f3f2e148430 100644 --- a/packages/toolbar/src/browser/abstract-toolbar-contribution.tsx +++ b/packages/toolbar/src/browser/abstract-toolbar-contribution.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/toolbar/src/browser/application-shell-with-toolbar-override.ts b/packages/toolbar/src/browser/application-shell-with-toolbar-override.ts index 21dfbe0ec9397..207fd54447fa6 100644 --- a/packages/toolbar/src/browser/application-shell-with-toolbar-override.ts +++ b/packages/toolbar/src/browser/application-shell-with-toolbar-override.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/toolbar/src/browser/codicons.ts b/packages/toolbar/src/browser/codicons.ts index bbef9d2fd4e67..e6be393f39f88 100644 --- a/packages/toolbar/src/browser/codicons.ts +++ b/packages/toolbar/src/browser/codicons.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/quotes, max-len */ diff --git a/packages/toolbar/src/browser/font-awesome-icons.ts b/packages/toolbar/src/browser/font-awesome-icons.ts index ea0836823416d..fb5d2640c71ab 100644 --- a/packages/toolbar/src/browser/font-awesome-icons.ts +++ b/packages/toolbar/src/browser/font-awesome-icons.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/quotes, max-len */ diff --git a/packages/toolbar/src/browser/package.spec.ts b/packages/toolbar/src/browser/package.spec.ts index cef19cfa2a4c4..45531b1c2f112 100644 --- a/packages/toolbar/src/browser/package.spec.ts +++ b/packages/toolbar/src/browser/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** describe('timeline package', () => { diff --git a/packages/toolbar/src/browser/style/toolbar.css b/packages/toolbar/src/browser/style/toolbar.css index 8696116a4f9d5..5b1f309c4aecd 100644 --- a/packages/toolbar/src/browser/style/toolbar.css +++ b/packages/toolbar/src/browser/style/toolbar.css @@ -11,243 +11,245 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ #main-toolbar { - --theia-toolbar-height: calc(var(--theia-private-menubar-height) - 2px); - --theia-toolbar-item-padding: 5px; - --theia-toolbar-icon-size: 20px; + --theia-toolbar-height: calc(var(--theia-private-menubar-height) - 2px); + --theia-toolbar-item-padding: 5px; + --theia-toolbar-icon-size: 20px; - min-height: var(--theia-toolbar-height); - color: var(--theia-mainToolbar-foreground); - background: var(--theia-mainToolbar-background); - padding: 2px 4px; - display: flex; - flex-direction: column; - justify-content: center; - position: relative; + min-height: var(--theia-toolbar-height); + color: var(--theia-mainToolbar-foreground); + background: var(--theia-mainToolbar-background); + padding: 2px 4px; + display: flex; + flex-direction: column; + justify-content: center; + position: relative; } #main-toolbar .theia-progress-bar-container { - position: absolute; - bottom: 0; + position: absolute; + bottom: 0; } .toolbar-wrapper { - display: flex; - flex-direction: row; - width: 100%; - overflow: hidden; + display: flex; + flex-direction: row; + width: 100%; + overflow: hidden; } .toolbar-wrapper .toolbar-column { - display: flex; - flex: 1; + display: flex; + flex: 1; } .toolbar-wrapper .left { - justify-content: flex-start; + justify-content: flex-start; } .toolbar-wrapper .center { - justify-content: center; + justify-content: center; } .toolbar-wrapper .right { - justify-content: flex-end; + justify-content: flex-end; } .toolbar-wrapper:focus { - outline: none; + outline: none; } #main-toolbar .toolbar-item { - padding: 2px; - margin: 0 2px; - box-sizing: border-box; - position: relative; - background: unset; - cursor: pointer; + padding: 2px; + margin: 0 2px; + box-sizing: border-box; + position: relative; + background: unset; + cursor: pointer; } #main-toolbar .empty-column-space { - flex-grow: 1; + flex-grow: 1; } #main-toolbar .toolbar-item .codicon, #main-toolbar .toolbar-item .fa { - font-size: var(--theia-toolbar-icon-size); - width: unset; - min-width: var(--theia-toolbar-icon-size); - height: var(--theia-toolbar-icon-size); - line-height: var(--theia-toolbar-icon-size); + font-size: var(--theia-toolbar-icon-size); + width: unset; + min-width: var(--theia-toolbar-icon-size); + height: var(--theia-toolbar-icon-size); + line-height: var(--theia-toolbar-icon-size); } -#main-toolbar .toolbar-item.action-label.enabled:hover:not(.dragging):not(.active) { - background-color: var(--theia-toolbar-hoverBackground); +#main-toolbar + .toolbar-item.action-label.enabled:hover:not(.dragging):not(.active) { + background-color: var(--theia-toolbar-hoverBackground); } #main-toolbar .toolbar-item.action-label:not(.enabled) { - cursor: default; + cursor: default; } #main-toolbar .toolbar-item .hover-overlay { - position: absolute; - pointer-events: none; - height: 100%; - width: 100%; - left: 0; - top: 0; + position: absolute; + pointer-events: none; + height: 100%; + width: 100%; + left: 0; + top: 0; } #main-toolbar .toolbar-item .hover-overlay.drag-over { - background-color: var(--theia-activityBar-foreground); - opacity: 0.3; + background-color: var(--theia-activityBar-foreground); + opacity: 0.3; } #main-toolbar .toolbar-item .hover-overlay.location-left { - width: 25%; + width: 25%; } #main-toolbar .toolbar-item .hover-overlay.location-right { - width: 25%; - left: 75%; - right: 0; + width: 25%; + left: 75%; + right: 0; } #main-toolbar .toolbar-item.dragging { - opacity: 0.3; + opacity: 0.3; } #main-toolbar .toolbar-item:focus { - outline: none; + outline: none; } #main-toolbar .item:focus, #main-toolbar .item div:focus { - outline: none; + outline: none; } #main-toolbar .separator { - width: 1px; - background-color: var(--theia-activityBar-foreground); - opacity: var(--theia-mod-disabled-opacity); - margin: 0 5px; + width: 1px; + background-color: var(--theia-activityBar-foreground); + opacity: var(--theia-mod-disabled-opacity); + margin: 0 5px; } .toolbar-column { - display: flex; + display: flex; } .toolbar-column.left { - margin-right: var(--theia-toolbar-item-padding); + margin-right: var(--theia-toolbar-item-padding); } .toolbar-column.right { - margin-left: var(--theia-toolbar-item-padding); + margin-left: var(--theia-toolbar-item-padding); } .toolbar-column.empty { - min-width: 60px; + min-width: 60px; } .empty-column-space.drag-over { - background-color: var(--theia-activityBar-foreground); - opacity: 0.3; - border-radius: 2px; + background-color: var(--theia-activityBar-foreground); + opacity: 0.3; + border-radius: 2px; } #toolbar-icon-selector-dialog { - --theia-icon-dialog-icon-size: 20px; + --theia-icon-dialog-icon-size: 20px; } #toolbar-icon-selector-dialog .dialogBlock { - max-height: 75%; - width: 600px; + max-height: 75%; + width: 600px; } #toolbar-icon-selector-dialog .dialogContent { - overflow: hidden; - display: block; + overflow: hidden; + display: block; } #toolbar-icon-selector-dialog .dialogContent .icon-selector-options { - display: flex; + display: flex; } #toolbar-icon-selector-dialog .dialogContent .icon-wrapper:focus { - box-shadow: unset; - outline: solid 1px var(--theia-focusBorder); + box-shadow: unset; + outline: solid 1px var(--theia-focusBorder); } #toolbar-icon-selector-dialog .dialogControl { - padding-top: var(--theia-ui-padding); + padding-top: var(--theia-ui-padding); } #toolbar-icon-selector-dialog .toolbar-icon-dialog-content.grid { - --grid-size: 28px; - display: grid; - grid-template-columns: repeat(20, var(--grid-size)); - grid-template-rows: var(--grid-size); - grid-auto-rows: var(--grid-size); + --grid-size: 28px; + display: grid; + grid-template-columns: repeat(20, var(--grid-size)); + grid-template-rows: var(--grid-size); + grid-auto-rows: var(--grid-size); } #toolbar-icon-selector-dialog .toolbar-icon-dialog-content .icon-wrapper { - height: 100%; - width: 100%; - display: flex; - justify-content: center; - align-items: center; + height: 100%; + width: 100%; + display: flex; + justify-content: center; + align-items: center; } #toolbar-icon-selector-dialog .toolbar-icon-dialog-content .search-placeholder { - text-align: center; - margin-top: var(--theia-ui-padding); - font-size: 1.2em; + text-align: center; + margin-top: var(--theia-ui-padding); + font-size: 1.2em; } #toolbar-icon-selector-dialog .toolbar-icon-controls { - display: flex; - width: 100%; - justify-content: space-between; + display: flex; + width: 100%; + justify-content: space-between; } #toolbar-icon-selector-dialog .toolbar-icon-controls .default-button { - display: flex; + display: flex; } #toolbar-icon-selector-dialog .toolbar-icon-controls .toolbar-default-icon { - margin-left: var(--theia-ui-padding); - font-size: var(--theia-icon-dialog-icon-size); + margin-left: var(--theia-ui-padding); + font-size: var(--theia-icon-dialog-icon-size); } #toolbar-icon-selector-dialog .icon-selector-options { - justify-content: space-between; + justify-content: space-between; } #toolbar-icon-selector-dialog .icon-selector-options .icon-filter-input { - height: 18px; + height: 18px; } #toolbar-icon-selector-dialog .toolbar-icon-select { - margin-bottom: var(--theia-ui-padding); + margin-bottom: var(--theia-ui-padding); } - -#toolbar-icon-selector-dialog .toolbar-icon-dialog-content .icon-wrapper.selected { - background-color: var(--theia-list-activeSelectionBackground); +#toolbar-icon-selector-dialog + .toolbar-icon-dialog-content + .icon-wrapper.selected { + background-color: var(--theia-list-activeSelectionBackground); } #toolbar-icon-selector-dialog .toolbar-icon-dialog-content .fa, #toolbar-icon-selector-dialog .toolbar-icon-dialog-content .codicon { - font-size: var(--theia-icon-dialog-icon-size); + font-size: var(--theia-icon-dialog-icon-size); } #toolbar-icon-selector-dialog .toolbar-scroll-container { - height: 375px; - position: relative; - padding: 0 var(--theia-ui-padding); - border: 1px solid var(--theia-editorWidget-border); - background-color: var(--theia-dropdown-background); + height: 375px; + position: relative; + padding: 0 var(--theia-ui-padding); + border: 1px solid var(--theia-editorWidget-border); + background-color: var(--theia-dropdown-background); } diff --git a/packages/toolbar/src/browser/toolbar-command-contribution.ts b/packages/toolbar/src/browser/toolbar-command-contribution.ts index e43bc512eac83..34f565c4d96ed 100644 --- a/packages/toolbar/src/browser/toolbar-command-contribution.ts +++ b/packages/toolbar/src/browser/toolbar-command-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/toolbar/src/browser/toolbar-command-quick-input-service.ts b/packages/toolbar/src/browser/toolbar-command-quick-input-service.ts index a1910c450aa72..de7cddef24c8d 100644 --- a/packages/toolbar/src/browser/toolbar-command-quick-input-service.ts +++ b/packages/toolbar/src/browser/toolbar-command-quick-input-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, CommandRegistry, CommandService, nls } from '@theia/core'; diff --git a/packages/toolbar/src/browser/toolbar-constants.ts b/packages/toolbar/src/browser/toolbar-constants.ts index 6bdf2dffd9fcd..7bbc9ce0789d6 100644 --- a/packages/toolbar/src/browser/toolbar-constants.ts +++ b/packages/toolbar/src/browser/toolbar-constants.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, isObject, MenuPath, nls } from '@theia/core'; diff --git a/packages/toolbar/src/browser/toolbar-controller.ts b/packages/toolbar/src/browser/toolbar-controller.ts index 09f384d8512a8..0198b2a5cf199 100644 --- a/packages/toolbar/src/browser/toolbar-controller.ts +++ b/packages/toolbar/src/browser/toolbar-controller.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Command, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core'; diff --git a/packages/toolbar/src/browser/toolbar-defaults.ts b/packages/toolbar/src/browser/toolbar-defaults.ts index 45fbb964e564f..53e25cd6cdc93 100644 --- a/packages/toolbar/src/browser/toolbar-defaults.ts +++ b/packages/toolbar/src/browser/toolbar-defaults.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/toolbar/src/browser/toolbar-frontend-module.ts b/packages/toolbar/src/browser/toolbar-frontend-module.ts index 71eb314bfe4a9..e7895098657a3 100644 --- a/packages/toolbar/src/browser/toolbar-frontend-module.ts +++ b/packages/toolbar/src/browser/toolbar-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/toolbar.css'; diff --git a/packages/toolbar/src/browser/toolbar-icon-selector-dialog.tsx b/packages/toolbar/src/browser/toolbar-icon-selector-dialog.tsx index 82d8fc9a6711d..c4f069987e7aa 100644 --- a/packages/toolbar/src/browser/toolbar-icon-selector-dialog.tsx +++ b/packages/toolbar/src/browser/toolbar-icon-selector-dialog.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/toolbar/src/browser/toolbar-interfaces.ts b/packages/toolbar/src/browser/toolbar-interfaces.ts index 1c2d0a4513ff5..b43ed7989c300 100644 --- a/packages/toolbar/src/browser/toolbar-interfaces.ts +++ b/packages/toolbar/src/browser/toolbar-interfaces.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/toolbar/src/browser/toolbar-preference-contribution.ts b/packages/toolbar/src/browser/toolbar-preference-contribution.ts index d9101e829322e..10290505176c5 100644 --- a/packages/toolbar/src/browser/toolbar-preference-contribution.ts +++ b/packages/toolbar/src/browser/toolbar-preference-contribution.ts @@ -11,7 +11,7 @@ // 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 +// 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'; diff --git a/packages/toolbar/src/browser/toolbar-preference-schema.ts b/packages/toolbar/src/browser/toolbar-preference-schema.ts index d253cd583851d..f12ada975767a 100644 --- a/packages/toolbar/src/browser/toolbar-preference-schema.ts +++ b/packages/toolbar/src/browser/toolbar-preference-schema.ts @@ -11,7 +11,7 @@ // 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 +// 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'; diff --git a/packages/toolbar/src/browser/toolbar-storage-provider.ts b/packages/toolbar/src/browser/toolbar-storage-provider.ts index 9238fd9ff66ae..ec9b414b44393 100644 --- a/packages/toolbar/src/browser/toolbar-storage-provider.ts +++ b/packages/toolbar/src/browser/toolbar-storage-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as jsoncParser from 'jsonc-parser'; diff --git a/packages/toolbar/src/browser/toolbar.tsx b/packages/toolbar/src/browser/toolbar.tsx index a4efe336d9920..d498a1acef5d7 100644 --- a/packages/toolbar/src/browser/toolbar.tsx +++ b/packages/toolbar/src/browser/toolbar.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/typehierarchy/package.json b/packages/typehierarchy/package.json index 3b4333281490e..599e1de78531a 100644 --- a/packages/typehierarchy/package.json +++ b/packages/typehierarchy/package.json @@ -19,7 +19,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/typehierarchy/src/browser/index.ts b/packages/typehierarchy/src/browser/index.ts index c0a5250f12c5e..6696c5b821582 100644 --- a/packages/typehierarchy/src/browser/index.ts +++ b/packages/typehierarchy/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './typehierarchy'; diff --git a/packages/typehierarchy/src/browser/style/index.css b/packages/typehierarchy/src/browser/style/index.css index b23db3f19c68e..1baea7ee1a83b 100644 --- a/packages/typehierarchy/src/browser/style/index.css +++ b/packages/typehierarchy/src/browser/style/index.css @@ -11,18 +11,18 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ .theia-type-hierarchy-tree { - font-size: var(--theia-ui-font-size0); + font-size: var(--theia-ui-font-size0); } .theia-type-hierarchy-tree .theia-caption-suffix { - padding-left: 10px !important; + padding-left: 10px !important; } .theia-type-hierarchy-tree .theia-caption-prefix { - padding-right: 5px !important; - padding-left: 1px !important; + padding-right: 5px !important; + padding-left: 1px !important; } diff --git a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-container.ts b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-container.ts index 54c408702d525..dae242f84a070 100644 --- a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-container.ts +++ b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-container.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces, Container } from '@theia/core/shared/inversify'; diff --git a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-model.ts b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-model.ts index 47347d98958f9..8b99ae1420362 100644 --- a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-model.ts +++ b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx index 708ff93901170..899888aaa026f 100644 --- a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx +++ b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/typehierarchy/src/browser/tree/typehierarchy-tree.ts b/packages/typehierarchy/src/browser/tree/typehierarchy-tree.ts index 58c8c7578eb15..517fe17ebc3e4 100644 --- a/packages/typehierarchy/src/browser/tree/typehierarchy-tree.ts +++ b/packages/typehierarchy/src/browser/tree/typehierarchy-tree.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/typehierarchy/src/browser/typehierarchy-contribution.ts b/packages/typehierarchy/src/browser/typehierarchy-contribution.ts index b53449dd9f638..a95a08b89f56f 100644 --- a/packages/typehierarchy/src/browser/typehierarchy-contribution.ts +++ b/packages/typehierarchy/src/browser/typehierarchy-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/typehierarchy/src/browser/typehierarchy-frontend-module.ts b/packages/typehierarchy/src/browser/typehierarchy-frontend-module.ts index 9801c6e4acf2a..62622a4b23450 100644 --- a/packages/typehierarchy/src/browser/typehierarchy-frontend-module.ts +++ b/packages/typehierarchy/src/browser/typehierarchy-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { bindContributionProvider } from '@theia/core/lib/common'; import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/typehierarchy/src/browser/typehierarchy-provider.ts b/packages/typehierarchy/src/browser/typehierarchy-provider.ts index 0eba9f76182f0..b0c594d460a45 100644 --- a/packages/typehierarchy/src/browser/typehierarchy-provider.ts +++ b/packages/typehierarchy/src/browser/typehierarchy-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/typehierarchy/src/browser/typehierarchy-service.ts b/packages/typehierarchy/src/browser/typehierarchy-service.ts index 15c319692bc5e..13901c3edad38 100644 --- a/packages/typehierarchy/src/browser/typehierarchy-service.ts +++ b/packages/typehierarchy/src/browser/typehierarchy-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { CancellationToken } from '@theia/core'; diff --git a/packages/typehierarchy/src/browser/typehierarchy.ts b/packages/typehierarchy/src/browser/typehierarchy.ts index a6aa6f35731ac..3650093157061 100644 --- a/packages/typehierarchy/src/browser/typehierarchy.ts +++ b/packages/typehierarchy/src/browser/typehierarchy.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { UriComponents } from '@theia/core/lib/common/uri'; diff --git a/packages/typehierarchy/src/package.spec.ts b/packages/typehierarchy/src/package.spec.ts index 2a90219f4d3d1..4dc832c0ceeb1 100644 --- a/packages/typehierarchy/src/package.spec.ts +++ b/packages/typehierarchy/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/userstorage/package.json b/packages/userstorage/package.json index b0fb33503f0a6..f57960afad165 100644 --- a/packages/userstorage/package.json +++ b/packages/userstorage/package.json @@ -17,7 +17,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/userstorage/src/browser/index.ts b/packages/userstorage/src/browser/index.ts index c75c8f8e53e33..601b6e0c20a9f 100644 --- a/packages/userstorage/src/browser/index.ts +++ b/packages/userstorage/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './user-storage-uri'; diff --git a/packages/userstorage/src/browser/user-storage-contribution.ts b/packages/userstorage/src/browser/user-storage-contribution.ts index 6dfc09d51d3f0..b988885d5681d 100644 --- a/packages/userstorage/src/browser/user-storage-contribution.ts +++ b/packages/userstorage/src/browser/user-storage-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/userstorage/src/browser/user-storage-frontend-module.ts b/packages/userstorage/src/browser/user-storage-frontend-module.ts index 6d45b4ae5f701..4dd44954bf424 100644 --- a/packages/userstorage/src/browser/user-storage-frontend-module.ts +++ b/packages/userstorage/src/browser/user-storage-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/userstorage/src/browser/user-storage-uri.ts b/packages/userstorage/src/browser/user-storage-uri.ts index 956d4d7c09487..fd2f2d546d760 100644 --- a/packages/userstorage/src/browser/user-storage-uri.ts +++ b/packages/userstorage/src/browser/user-storage-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/userstorage/src/package.spec.ts b/packages/userstorage/src/package.spec.ts index 45cd992e6da4d..5361fd0eb8496 100644 --- a/packages/userstorage/src/package.spec.ts +++ b/packages/userstorage/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/variable-resolver/package.json b/packages/variable-resolver/package.json index 4695f02e6faf4..4ab8392376eda 100644 --- a/packages/variable-resolver/package.json +++ b/packages/variable-resolver/package.json @@ -16,7 +16,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/variable-resolver/src/browser/common-variable-contribution.ts b/packages/variable-resolver/src/browser/common-variable-contribution.ts index ffa7bb4c5b082..3b88524a835e0 100644 --- a/packages/variable-resolver/src/browser/common-variable-contribution.ts +++ b/packages/variable-resolver/src/browser/common-variable-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/variable-resolver/src/browser/index.ts b/packages/variable-resolver/src/browser/index.ts index b05541b12df56..a2565d2fc69d1 100644 --- a/packages/variable-resolver/src/browser/index.ts +++ b/packages/variable-resolver/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './variable'; diff --git a/packages/variable-resolver/src/browser/variable-input-schema.ts b/packages/variable-resolver/src/browser/variable-input-schema.ts index 6af21095c9298..564f51ea04a1a 100644 --- a/packages/variable-resolver/src/browser/variable-input-schema.ts +++ b/packages/variable-resolver/src/browser/variable-input-schema.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/variable-resolver/src/browser/variable-input.ts b/packages/variable-resolver/src/browser/variable-input.ts index 918d9ba8b8a50..2fcb6d0e3609d 100644 --- a/packages/variable-resolver/src/browser/variable-input.ts +++ b/packages/variable-resolver/src/browser/variable-input.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/variable-resolver/src/browser/variable-quick-open-service.ts b/packages/variable-resolver/src/browser/variable-quick-open-service.ts index eee623c966194..9b69af099a3da 100644 --- a/packages/variable-resolver/src/browser/variable-quick-open-service.ts +++ b/packages/variable-resolver/src/browser/variable-quick-open-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, optional } from '@theia/core/shared/inversify'; diff --git a/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.spec.ts b/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.spec.ts index 0382c232c68d0..f7fc74df400d4 100644 --- a/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.spec.ts +++ b/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.ts b/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.ts index 610112f455bb4..093065d592e02 100644 --- a/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.ts +++ b/packages/variable-resolver/src/browser/variable-resolver-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, named } from '@theia/core/shared/inversify'; diff --git a/packages/variable-resolver/src/browser/variable-resolver-frontend-module.ts b/packages/variable-resolver/src/browser/variable-resolver-frontend-module.ts index e14d3e7253906..bc4118f3d25a6 100644 --- a/packages/variable-resolver/src/browser/variable-resolver-frontend-module.ts +++ b/packages/variable-resolver/src/browser/variable-resolver-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/variable-resolver/src/browser/variable-resolver-service.spec.ts b/packages/variable-resolver/src/browser/variable-resolver-service.spec.ts index d79455f04785a..6bf22e86f44b4 100644 --- a/packages/variable-resolver/src/browser/variable-resolver-service.spec.ts +++ b/packages/variable-resolver/src/browser/variable-resolver-service.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/variable-resolver/src/browser/variable-resolver-service.ts b/packages/variable-resolver/src/browser/variable-resolver-service.ts index e566a7e517b17..093f350d84d5e 100644 --- a/packages/variable-resolver/src/browser/variable-resolver-service.ts +++ b/packages/variable-resolver/src/browser/variable-resolver-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/variable-resolver/src/browser/variable.spec.ts b/packages/variable-resolver/src/browser/variable.spec.ts index 6cc67a02d7825..1276b708b6ed6 100644 --- a/packages/variable-resolver/src/browser/variable.spec.ts +++ b/packages/variable-resolver/src/browser/variable.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as chai from 'chai'; diff --git a/packages/variable-resolver/src/browser/variable.ts b/packages/variable-resolver/src/browser/variable.ts index 99fa1e05a3417..8aa7462aa9a86 100644 --- a/packages/variable-resolver/src/browser/variable.ts +++ b/packages/variable-resolver/src/browser/variable.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/variable-resolver/src/common/variable-types.ts b/packages/variable-resolver/src/common/variable-types.ts index 08a2320e93607..a1f96d5efdd88 100644 --- a/packages/variable-resolver/src/common/variable-types.ts +++ b/packages/variable-resolver/src/common/variable-types.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/packages/vsx-registry/package.json b/packages/vsx-registry/package.json index a392c388ba149..cb22c29ddf3a9 100644 --- a/packages/vsx-registry/package.json +++ b/packages/vsx-registry/package.json @@ -27,7 +27,7 @@ "backend": "lib/node/vsx-registry-backend-module" } ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/vsx-registry/src/browser/recommended-extensions/preference-provider-overrides.ts b/packages/vsx-registry/src/browser/recommended-extensions/preference-provider-overrides.ts index e8ca8fcc7301a..dfa3eef4a0b68 100644 --- a/packages/vsx-registry/src/browser/recommended-extensions/preference-provider-overrides.ts +++ b/packages/vsx-registry/src/browser/recommended-extensions/preference-provider-overrides.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-json-schema.ts b/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-json-schema.ts index 4522823d6ece0..617773cb96b1f 100644 --- a/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-json-schema.ts +++ b/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-json-schema.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-preference-contribution.ts b/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-preference-contribution.ts index 459ecfa23f75c..17e390b260423 100644 --- a/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-preference-contribution.ts +++ b/packages/vsx-registry/src/browser/recommended-extensions/recommended-extensions-preference-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { createPreferenceProxy, PreferenceContribution, PreferenceSchema, PreferenceScope, PreferenceService } from '@theia/core/lib/browser'; diff --git a/packages/vsx-registry/src/browser/style/index.css b/packages/vsx-registry/src/browser/style/index.css index ea441af882de0..606e298cdf87a 100644 --- a/packages/vsx-registry/src/browser/style/index.css +++ b/packages/vsx-registry/src/browser/style/index.css @@ -11,344 +11,362 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/ :root { - --theia-vsx-extension-icon-size: calc(var(--theia-ui-icon-font-size)*3); - --theia-vsx-extension-editor-icon-size: calc(var(--theia-vsx-extension-icon-size)*3); + --theia-vsx-extension-icon-size: calc(var(--theia-ui-icon-font-size) * 3); + --theia-vsx-extension-editor-icon-size: calc( + var(--theia-vsx-extension-icon-size) * 3 + ); } .theia-vsx-extensions { - height: 100%; + height: 100%; } .theia-vsx-extension, .theia-vsx-extensions-view-container .part > .body { - min-height: calc(var(--theia-content-line-height)*3) + min-height: calc(var(--theia-content-line-height) * 3); } .theia-vsx-extensions-search-bar { - padding: var(--theia-ui-padding) var(--theia-scrollbar-width) var(--theia-ui-padding) 18px /* expansion toggle padding of tree elements in result list */; - display: flex; - align-content: center; + padding: var(--theia-ui-padding) var(--theia-scrollbar-width) + var(--theia-ui-padding) 18px + /* expansion toggle padding of tree elements in result list */; + display: flex; + align-content: center; } .theia-vsx-extensions-search-bar .theia-input { - line-height: var(--theia-content-line-height); - flex: 1; - padding-top: calc(var(--theia-ui-padding)/2); - padding-bottom: calc(var(--theia-ui-padding)/2); + line-height: var(--theia-content-line-height); + flex: 1; + padding-top: calc(var(--theia-ui-padding) / 2); + padding-bottom: calc(var(--theia-ui-padding) / 2); } .theia-vsx-extension { - display: flex; - flex-direction: row; - line-height: calc(var(--theia-content-line-height)*17/22); - align-items: center; + display: flex; + flex-direction: row; + line-height: calc(var(--theia-content-line-height) * 17 / 22); + align-items: center; } .theia-vsx-extension-icon { - height: var(--theia-vsx-extension-icon-size); - width: var(--theia-vsx-extension-icon-size); - align-self: center; - padding-right: calc(var(--theia-ui-padding)*2.5); - flex-shrink: 0; - object-fit: contain; + height: var(--theia-vsx-extension-icon-size); + width: var(--theia-vsx-extension-icon-size); + align-self: center; + padding-right: calc(var(--theia-ui-padding) * 2.5); + flex-shrink: 0; + object-fit: contain; } .theia-vsx-extension-icon.placeholder { - background-size: var(--theia-vsx-extension-icon-size); - background-repeat: no-repeat; - background-image: url('defaultIcon.png'); + background-size: var(--theia-vsx-extension-icon-size); + background-repeat: no-repeat; + background-image: url("defaultIcon.png"); } .theia-vsx-extension-content { - display: flex; - flex-direction: column; - width: calc(100% - var(--theia-vsx-extension-icon-size) - var(--theia-ui-padding)*2.5); + display: flex; + flex-direction: column; + width: calc( + 100% - var(--theia-vsx-extension-icon-size) - var(--theia-ui-padding) * 2.5 + ); } .theia-vsx-extension-content .title { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - white-space: nowrap; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + white-space: nowrap; } .theia-vsx-extension-content .title .name { - font-weight: bold; + font-weight: bold; } .theia-vsx-extension-content .title .version, .theia-vsx-extension-content .title .stat { - opacity: .85; - font-size: 80%; + opacity: 0.85; + font-size: 80%; } .theia-vsx-extension-content .title .stat .codicon { - font-size: 110%; + font-size: 110%; } .theia-vsx-extension-content .title .stat .download-count, .theia-vsx-extension-content .title .stat .average-rating { - display: inline-flex; - align-items: center; + display: inline-flex; + align-items: center; } .theia-vsx-extension-content .title .stat .average-rating > i { - color: #ff8e00; + color: #ff8e00; } .theia-vsx-extension-editor .download-count > i, .theia-vsx-extension-content .title .stat .average-rating > i, .theia-vsx-extension-content .title .stat .download-count > i { - padding-right: calc(var(--theia-ui-padding)/2); + padding-right: calc(var(--theia-ui-padding) / 2); } .theia-vsx-extension-content .title .stat .average-rating, .theia-vsx-extension-content .title .stat .download-count { - padding-left: var(--theia-ui-padding); + padding-left: var(--theia-ui-padding); } .theia-vsx-extension-description { - padding-right: calc(var(--theia-ui-padding)*2); + padding-right: calc(var(--theia-ui-padding) * 2); } .theia-vsx-extension-publisher { - font-weight: 600; - font-size: 90%; + font-weight: 600; + font-size: 90%; } .theia-vsx-extension-action-bar { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - white-space: nowrap; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + white-space: nowrap; } .theia-vsx-extension-action-bar .action { - font-size: 90%; - min-width: auto !important; - padding: 2px var(--theia-ui-padding) !important; - margin-top: 2px; - vertical-align: middle; + font-size: 90%; + min-width: auto !important; + padding: 2px var(--theia-ui-padding) !important; + margin-top: 2px; + vertical-align: middle; } /* Editor Section */ .theia-vsx-extension-editor { - height: 100%; - overflow: hidden; - display: flex; - flex-direction: column; - padding-top: 0; - position: relative; + height: 100%; + overflow: hidden; + display: flex; + flex-direction: column; + padding-top: 0; + position: relative; } .theia-vsx-extension-editor .header { - display: flex; - padding: calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3); - flex-shrink: 0; - border-bottom: 1px solid hsla(0, 0% ,50% ,.5); - width: 100%; - background: var(--theia-editor-background); + display: flex; + padding: calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3) + calc(var(--theia-ui-padding) * 3); + flex-shrink: 0; + border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); + width: 100%; + background: var(--theia-editor-background); } .theia-vsx-extension-editor .scroll-container { - position: relative; - padding-top: 0; - max-width: 100%; - width: 100%; + position: relative; + padding-top: 0; + max-width: 100%; + width: 100%; } .theia-vsx-extension-editor .body { - flex: 1; - padding: calc(var(--theia-ui-padding)*2); - padding-top: 0; - max-width: 1000px; - margin: 0 auto; - line-height: 22px; + flex: 1; + padding: calc(var(--theia-ui-padding) * 2); + padding-top: 0; + max-width: 1000px; + margin: 0 auto; + line-height: 22px; } .theia-vsx-extension-editor .body h1 { - padding-bottom: var(--theia-ui-padding); - border-bottom: 1px solid hsla(0, 0%, 50%, .5); - margin-top: calc(var(--theia-ui-padding) * 5); + padding-bottom: var(--theia-ui-padding); + border-bottom: 1px solid hsla(0, 0%, 50%, 0.5); + margin-top: calc(var(--theia-ui-padding) * 5); } .theia-vsx-extension-editor .body a { - text-decoration: none; + text-decoration: none; } .theia-vsx-extension-editor .body a:hover { - text-decoration: underline; + text-decoration: underline; } .theia-vsx-extension-editor .body table { - border-collapse: collapse; + border-collapse: collapse; } .theia-vsx-extension-editor .body table > thead > tr > th { - text-align: left; - border-bottom: 1px solid var(--theia-extensionEditor-tableHeadBorder); + text-align: left; + border-bottom: 1px solid var(--theia-extensionEditor-tableHeadBorder); } .theia-vsx-extension-editor .body table > thead > tr > th, .theia-vsx-extension-editor .body table > thead > tr > td, .theia-vsx-extension-editor .body table > tbody > tr > th, .theia-vsx-extension-editor .body table > tbody > tr > td { - padding: 5px 10px; + padding: 5px 10px; } .theia-vsx-extension-editor .body table > tbody > tr + tr > td { - border-top: 1px solid var(--theia-extensionEditor-tableCellBorder); + border-top: 1px solid var(--theia-extensionEditor-tableCellBorder); } .theia-vsx-extension-editor .scroll-container .body pre { - white-space: normal; + white-space: normal; } .theia-vsx-extension-editor .body img { - max-width: 100%; + max-width: 100%; } .theia-vsx-extension-editor .header .icon-container { - height: var(--theia-vsx-extension-editor-icon-size); - width: var(--theia-vsx-extension-editor-icon-size); - align-self: center; - padding-right: calc(var(--theia-ui-padding)*2.5); - flex-shrink: 0; - object-fit: contain; + height: var(--theia-vsx-extension-editor-icon-size); + width: var(--theia-vsx-extension-editor-icon-size); + align-self: center; + padding-right: calc(var(--theia-ui-padding) * 2.5); + flex-shrink: 0; + object-fit: contain; } .theia-vsx-extension-editor .header .icon-container.placeholder { - background-size: var(--theia-vsx-extension-editor-icon-size); - background-repeat: no-repeat; - background-image: url('defaultIcon.png'); + background-size: var(--theia-vsx-extension-editor-icon-size); + background-repeat: no-repeat; + background-image: url("defaultIcon.png"); } .theia-vsx-extension-editor .header .details { - overflow: hidden; - user-select: text; - -webkit-user-select: text; + overflow: hidden; + user-select: text; + -webkit-user-select: text; } .theia-vsx-extension-editor .header .details .title, .theia-vsx-extension-editor .header .details .subtitle { - display: flex; - align-items: center; + display: flex; + align-items: center; } .theia-vsx-extension-editor .header .details .title .name { - flex: 0; - font-size: calc(var(--theia-ui-font-size1)*2); - font-weight: 600; - white-space: nowrap; - cursor: pointer; + flex: 0; + font-size: calc(var(--theia-ui-font-size1) * 2); + font-weight: 600; + white-space: nowrap; + cursor: pointer; } .theia-vsx-extension-editor .header .details .title .identifier { - margin-left: calc(var(--theia-ui-padding)*5/3); - opacity: .6; - background: hsla(0,0%,68%,.31); - user-select: text; - -webkit-user-select: text; - white-space: nowrap; + margin-left: calc(var(--theia-ui-padding) * 5 / 3); + opacity: 0.6; + background: hsla(0, 0%, 68%, 0.31); + user-select: text; + -webkit-user-select: text; + white-space: nowrap; } .theia-vsx-extension-editor .header .details .title .preview { - background: #d63f26; + background: #d63f26; } .vs .theia-vsx-extension-editor .header .details .title .preview { - color: white; + color: white; } .theia-vsx-extension-editor .header .details .title .identifier, .theia-vsx-extension-editor .header .details .title .preview, .theia-vsx-extension-editor .header .details .title .builtin { - line-height: var(--theia-code-line-height); + line-height: var(--theia-code-line-height); } .theia-vsx-extension-editor .header .details .title .identifier, .theia-vsx-extension-editor .header .details .title .preview { - padding: calc(var(--theia-ui-padding)*2/3); - padding-top: 0px; - padding-bottom: 0px; - border-radius: calc(var(--theia-ui-padding)*2/3); + padding: calc(var(--theia-ui-padding) * 2 / 3); + padding-top: 0px; + padding-bottom: 0px; + border-radius: calc(var(--theia-ui-padding) * 2 / 3); } - .theia-vsx-extension-editor .header .details .title .preview, .theia-vsx-extension-editor .header .details .title .builtin { - font-size: var(--theia-ui-font-size0); - font-style: italic; - margin-left: calc(var(--theia-ui-padding)*5/3); + font-size: var(--theia-ui-font-size0); + font-style: italic; + margin-left: calc(var(--theia-ui-padding) * 5 / 3); } .theia-vsx-extension-editor .header .details .subtitle { - padding-top: var(--theia-ui-padding); - white-space: nowrap; + padding-top: var(--theia-ui-padding); + white-space: nowrap; } .theia-vsx-extension-editor .header .details .subtitle > span { - display: flex; - align-items: center; - cursor: pointer; - line-height: var(--theia-content-line-height); - height: var(--theia-content-line-height); + display: flex; + align-items: center; + cursor: pointer; + line-height: var(--theia-content-line-height); + height: var(--theia-content-line-height); } -.theia-vsx-extension-editor .header .details .subtitle > span:not(:first-child):not(:empty) { - border-left: 1px solid hsla(0,0%,50%,.7); - padding-left: calc(var(--theia-ui-padding)*2); - margin-left: calc(var(--theia-ui-padding)*2); - font-weight: 500; +.theia-vsx-extension-editor + .header + .details + .subtitle + > span:not(:first-child):not(:empty) { + border-left: 1px solid hsla(0, 0%, 50%, 0.7); + padding-left: calc(var(--theia-ui-padding) * 2); + margin-left: calc(var(--theia-ui-padding) * 2); + font-weight: 500; } .theia-vsx-extension-editor .header .details .subtitle .publisher { - font-size: var(--theia-ui-font-size3); + font-size: var(--theia-ui-font-size3); } -.theia-vsx-extension-editor .header .details .subtitle .publisher .namespace-access, +.theia-vsx-extension-editor + .header + .details + .subtitle + .publisher + .namespace-access, .theia-vsx-extension-editor .header .details .subtitle .download-count::before { - padding-right: var(--theia-ui-padding); + padding-right: var(--theia-ui-padding); } .theia-vsx-extension-editor .header .details .subtitle .average-rating > i { - color: #ff8e00; + color: #ff8e00; } -.theia-vsx-extension-editor .header .details .subtitle .average-rating > i:not(:first-child) { - padding-left: calc(var(--theia-ui-padding)/2); +.theia-vsx-extension-editor + .header + .details + .subtitle + .average-rating + > i:not(:first-child) { + padding-left: calc(var(--theia-ui-padding) / 2); } - .theia-vsx-extension-editor .header .details .description { - margin-top: calc(var(--theia-ui-padding)*5/3); + margin-top: calc(var(--theia-ui-padding) * 5 / 3); } .theia-vsx-extension-editor .action { - font-weight: 600; - margin-top: calc(var(--theia-ui-padding)*5/3); - margin-left: 0px; - padding: 1px var(--theia-ui-padding); - vertical-align: middle; + font-weight: 600; + margin-top: calc(var(--theia-ui-padding) * 5 / 3); + margin-left: 0px; + padding: 1px var(--theia-ui-padding); + vertical-align: middle; } /** Theming */ .theia-vsx-extension-editor .action.prominent, .theia-vsx-extension-action-bar .action.prominent { - color: var(--theia-extensionButton-prominentForeground); - background-color: var(--theia-extensionButton-prominentBackground); + color: var(--theia-extensionButton-prominentForeground); + background-color: var(--theia-extensionButton-prominentBackground); } .theia-vsx-extension-editor .action.prominent:hover, .theia-vsx-extension-action-bar .action.prominent:hover { - background-color: var(--theia-extensionButton-prominentHoverBackground); + background-color: var(--theia-extensionButton-prominentHoverBackground); } - diff --git a/packages/vsx-registry/src/browser/vsx-extension-commands.ts b/packages/vsx-registry/src/browser/vsx-extension-commands.ts index 6d13ba9f79009..6da5abaee26be 100644 --- a/packages/vsx-registry/src/browser/vsx-extension-commands.ts +++ b/packages/vsx-registry/src/browser/vsx-extension-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core/lib/common/nls'; diff --git a/packages/vsx-registry/src/browser/vsx-extension-editor-manager.ts b/packages/vsx-registry/src/browser/vsx-extension-editor-manager.ts index e39f64f01f951..b715271fa13c6 100644 --- a/packages/vsx-registry/src/browser/vsx-extension-editor-manager.ts +++ b/packages/vsx-registry/src/browser/vsx-extension-editor-manager.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-extension-editor.tsx b/packages/vsx-registry/src/browser/vsx-extension-editor.tsx index a31de53a6cbc6..cc00c9bd0b895 100644 --- a/packages/vsx-registry/src/browser/vsx-extension-editor.tsx +++ b/packages/vsx-registry/src/browser/vsx-extension-editor.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/vsx-registry/src/browser/vsx-extension.tsx b/packages/vsx-registry/src/browser/vsx-extension.tsx index 241fbe0d6fa0d..2994fe6b25618 100644 --- a/packages/vsx-registry/src/browser/vsx-extension.tsx +++ b/packages/vsx-registry/src/browser/vsx-extension.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-contribution.ts b/packages/vsx-registry/src/browser/vsx-extensions-contribution.ts index a67eddc6c09bb..88a131fd35cf1 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-contribution.ts +++ b/packages/vsx-registry/src/browser/vsx-extensions-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DateTime } from 'luxon'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-model.ts b/packages/vsx-registry/src/browser/vsx-extensions-model.ts index 3a12b34cd3116..ad24c1c81ca60 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-model.ts +++ b/packages/vsx-registry/src/browser/vsx-extensions-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-search-bar.tsx b/packages/vsx-registry/src/browser/vsx-extensions-search-bar.tsx index 92f2813bfecca..240a480d862df 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-search-bar.tsx +++ b/packages/vsx-registry/src/browser/vsx-extensions-search-bar.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as React from '@theia/core/shared/react'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-search-model.ts b/packages/vsx-registry/src/browser/vsx-extensions-search-model.ts index 3818abcd7d61f..f0831e3c65498 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-search-model.ts +++ b/packages/vsx-registry/src/browser/vsx-extensions-search-model.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-source.ts b/packages/vsx-registry/src/browser/vsx-extensions-source.ts index 57ca40e988cd7..c954fac38ed3c 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-source.ts +++ b/packages/vsx-registry/src/browser/vsx-extensions-source.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-view-container.ts b/packages/vsx-registry/src/browser/vsx-extensions-view-container.ts index 03b63bc8b9b29..07bd12a71152e 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-view-container.ts +++ b/packages/vsx-registry/src/browser/vsx-extensions-view-container.ts @@ -11,7 +11,7 @@ * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 *******************************************************************************‚*/ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-extensions-widget.tsx b/packages/vsx-registry/src/browser/vsx-extensions-widget.tsx index ea80579d095e9..c934595990578 100644 --- a/packages/vsx-registry/src/browser/vsx-extensions-widget.tsx +++ b/packages/vsx-registry/src/browser/vsx-extensions-widget.tsx @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/browser/vsx-language-quick-pick-service.ts b/packages/vsx-registry/src/browser/vsx-language-quick-pick-service.ts index 0780aa3370c7c..adc765f7df79b 100644 --- a/packages/vsx-registry/src/browser/vsx-language-quick-pick-service.ts +++ b/packages/vsx-registry/src/browser/vsx-language-quick-pick-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { LanguageQuickPickItem, LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service'; diff --git a/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts b/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts index 59e71c2fef2fb..649aacc6b835a 100644 --- a/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts +++ b/packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import '../../src/browser/style/index.css'; diff --git a/packages/vsx-registry/src/common/ovsx-client-provider.ts b/packages/vsx-registry/src/common/ovsx-client-provider.ts index c7edb6454d953..33de3e1cfc2d2 100644 --- a/packages/vsx-registry/src/common/ovsx-client-provider.ts +++ b/packages/vsx-registry/src/common/ovsx-client-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { RequestService } from '@theia/core/shared/@theia/request'; diff --git a/packages/vsx-registry/src/common/vsx-environment.ts b/packages/vsx-registry/src/common/vsx-environment.ts index 291ff27f1b248..d461b0eb827a3 100644 --- a/packages/vsx-registry/src/common/vsx-environment.ts +++ b/packages/vsx-registry/src/common/vsx-environment.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const VSX_ENVIRONMENT_PATH = '/services/vsx-environment'; diff --git a/packages/vsx-registry/src/common/vsx-extension-uri.ts b/packages/vsx-registry/src/common/vsx-extension-uri.ts index 30d66572dc836..15908a8107a1b 100644 --- a/packages/vsx-registry/src/common/vsx-extension-uri.ts +++ b/packages/vsx-registry/src/common/vsx-extension-uri.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri'; diff --git a/packages/vsx-registry/src/node/vsx-environment-impl.ts b/packages/vsx-registry/src/node/vsx-environment-impl.ts index 115f4e36a9197..850866c585545 100644 --- a/packages/vsx-registry/src/node/vsx-environment-impl.ts +++ b/packages/vsx-registry/src/node/vsx-environment-impl.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/node/vsx-extension-resolver.ts b/packages/vsx-registry/src/node/vsx-extension-resolver.ts index 95b4502cbc3db..26e63be0bfb31 100644 --- a/packages/vsx-registry/src/node/vsx-extension-resolver.ts +++ b/packages/vsx-registry/src/node/vsx-extension-resolver.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/vsx-registry/src/node/vsx-registry-backend-module.ts b/packages/vsx-registry/src/node/vsx-registry-backend-module.ts index 3b1908d23d39f..5491c8025ff4f 100644 --- a/packages/vsx-registry/src/node/vsx-registry-backend-module.ts +++ b/packages/vsx-registry/src/node/vsx-registry-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/packages/vsx-registry/src/package.spec.ts b/packages/vsx-registry/src/package.spec.ts index 139019508d098..44ac6365a0a0c 100644 --- a/packages/vsx-registry/src/package.spec.ts +++ b/packages/vsx-registry/src/package.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /* note: this bogus test file is required so that diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 471338de30e25..bc2cadb5ddb10 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -21,7 +21,7 @@ "keywords": [ "theia-extension" ], - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0", "repository": { "type": "git", "url": "https://github.com/eclipse-theia/theia.git" diff --git a/packages/workspace/src/browser/diff-service.ts b/packages/workspace/src/browser/diff-service.ts index 1ed91e22f2d43..3d55d35d87f8e 100644 --- a/packages/workspace/src/browser/diff-service.ts +++ b/packages/workspace/src/browser/diff-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/index.ts b/packages/workspace/src/browser/index.ts index 7f06220471b4e..ad1c39060c916 100644 --- a/packages/workspace/src/browser/index.ts +++ b/packages/workspace/src/browser/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './workspace-commands'; diff --git a/packages/workspace/src/browser/quick-open-workspace.ts b/packages/workspace/src/browser/quick-open-workspace.ts index 427d28a9ab4fc..8b044cffe5ed4 100644 --- a/packages/workspace/src/browser/quick-open-workspace.ts +++ b/packages/workspace/src/browser/quick-open-workspace.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, optional } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts b/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts index 7949560ea117b..cca1e15ec6b8d 100644 --- a/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts +++ b/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { nls } from '@theia/core'; diff --git a/packages/workspace/src/browser/workspace-breadcrumbs-contribution.ts b/packages/workspace/src/browser/workspace-breadcrumbs-contribution.ts index a654eb5146d7a..77ff56bd8fb3e 100644 --- a/packages/workspace/src/browser/workspace-breadcrumbs-contribution.ts +++ b/packages/workspace/src/browser/workspace-breadcrumbs-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { FilepathBreadcrumb } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumb'; diff --git a/packages/workspace/src/browser/workspace-commands.spec.ts b/packages/workspace/src/browser/workspace-commands.spec.ts index 68a369b0bd8bb..9ebbf174d8995 100644 --- a/packages/workspace/src/browser/workspace-commands.spec.ts +++ b/packages/workspace/src/browser/workspace-commands.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/workspace/src/browser/workspace-commands.ts b/packages/workspace/src/browser/workspace-commands.ts index 8ebd0011dffef..6f1c944f9972a 100644 --- a/packages/workspace/src/browser/workspace-commands.ts +++ b/packages/workspace/src/browser/workspace-commands.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-compare-handler.ts b/packages/workspace/src/browser/workspace-compare-handler.ts index 7e28f979e1507..01030fbbab8ec 100644 --- a/packages/workspace/src/browser/workspace-compare-handler.ts +++ b/packages/workspace/src/browser/workspace-compare-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-delete-handler.ts b/packages/workspace/src/browser/workspace-delete-handler.ts index 3b51481007931..4d96a6540d2f8 100644 --- a/packages/workspace/src/browser/workspace-delete-handler.ts +++ b/packages/workspace/src/browser/workspace-delete-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-duplicate-handler.ts b/packages/workspace/src/browser/workspace-duplicate-handler.ts index 24ef29c711b9c..4cbbbc67bdc03 100644 --- a/packages/workspace/src/browser/workspace-duplicate-handler.ts +++ b/packages/workspace/src/browser/workspace-duplicate-handler.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import URI from '@theia/core/lib/common/uri'; diff --git a/packages/workspace/src/browser/workspace-frontend-contribution.ts b/packages/workspace/src/browser/workspace-frontend-contribution.ts index f3b266837f605..f655868bbfca9 100644 --- a/packages/workspace/src/browser/workspace-frontend-contribution.ts +++ b/packages/workspace/src/browser/workspace-frontend-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-frontend-module.ts b/packages/workspace/src/browser/workspace-frontend-module.ts index 3456cf52a0f4b..ef6ff08a2c6a5 100644 --- a/packages/workspace/src/browser/workspace-frontend-module.ts +++ b/packages/workspace/src/browser/workspace-frontend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule, interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-input-dialog.ts b/packages/workspace/src/browser/workspace-input-dialog.ts index 226b222f4b6b8..2265ae3c9ff46 100644 --- a/packages/workspace/src/browser/workspace-input-dialog.ts +++ b/packages/workspace/src/browser/workspace-input-dialog.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-preferences.ts b/packages/workspace/src/browser/workspace-preferences.ts index ce828eed41cef..f89b266eaeda7 100644 --- a/packages/workspace/src/browser/workspace-preferences.ts +++ b/packages/workspace/src/browser/workspace-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { interfaces } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-schema-updater.ts b/packages/workspace/src/browser/workspace-schema-updater.ts index 8f7fcc48f96d9..ab70614284984 100644 --- a/packages/workspace/src/browser/workspace-schema-updater.ts +++ b/packages/workspace/src/browser/workspace-schema-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-service.ts b/packages/workspace/src/browser/workspace-service.ts index 41358edfaf916..c093b494f07b1 100644 --- a/packages/workspace/src/browser/workspace-service.ts +++ b/packages/workspace/src/browser/workspace-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-storage-service.ts b/packages/workspace/src/browser/workspace-storage-service.ts index 40b443c233987..28c3673730b06 100644 --- a/packages/workspace/src/browser/workspace-storage-service.ts +++ b/packages/workspace/src/browser/workspace-storage-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-trust-preferences.ts b/packages/workspace/src/browser/workspace-trust-preferences.ts index 61cacf8533cf3..228c10ca55768 100644 --- a/packages/workspace/src/browser/workspace-trust-preferences.ts +++ b/packages/workspace/src/browser/workspace-trust-preferences.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { diff --git a/packages/workspace/src/browser/workspace-trust-service.ts b/packages/workspace/src/browser/workspace-trust-service.ts index 0caeca90b5c06..6572da09024ee 100644 --- a/packages/workspace/src/browser/workspace-trust-service.ts +++ b/packages/workspace/src/browser/workspace-trust-service.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ConfirmDialog, Dialog, PreferenceChange, StorageService } from '@theia/core/lib/browser'; diff --git a/packages/workspace/src/browser/workspace-uri-contribution.spec.ts b/packages/workspace/src/browser/workspace-uri-contribution.spec.ts index 65c2e341bbe4a..ccfafb1023a05 100644 --- a/packages/workspace/src/browser/workspace-uri-contribution.spec.ts +++ b/packages/workspace/src/browser/workspace-uri-contribution.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom'; diff --git a/packages/workspace/src/browser/workspace-uri-contribution.ts b/packages/workspace/src/browser/workspace-uri-contribution.ts index f9973fd6d8ffe..3fa5d5eb4d208 100644 --- a/packages/workspace/src/browser/workspace-uri-contribution.ts +++ b/packages/workspace/src/browser/workspace-uri-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { DefaultUriLabelProviderContribution, URIIconReference } from '@theia/core/lib/browser/label-provider'; diff --git a/packages/workspace/src/browser/workspace-user-working-directory-provider.ts b/packages/workspace/src/browser/workspace-user-working-directory-provider.ts index 645e8812490d8..26d4121f7add8 100644 --- a/packages/workspace/src/browser/workspace-user-working-directory-provider.ts +++ b/packages/workspace/src/browser/workspace-user-working-directory-provider.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { inject, injectable } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-utils.ts b/packages/workspace/src/browser/workspace-utils.ts index 1483f813fa6be..927a8bd66775f 100644 --- a/packages/workspace/src/browser/workspace-utils.ts +++ b/packages/workspace/src/browser/workspace-utils.ts @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // TODO get rid of util files, replace with methods in a responsible class diff --git a/packages/workspace/src/browser/workspace-variable-contribution.ts b/packages/workspace/src/browser/workspace-variable-contribution.ts index 12dd2ca0d100d..6d3e808bd4555 100644 --- a/packages/workspace/src/browser/workspace-variable-contribution.ts +++ b/packages/workspace/src/browser/workspace-variable-contribution.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/browser/workspace-window-title-updater.ts b/packages/workspace/src/browser/workspace-window-title-updater.ts index 64a62fdb825af..c11954bad4479 100644 --- a/packages/workspace/src/browser/workspace-window-title-updater.ts +++ b/packages/workspace/src/browser/workspace-window-title-updater.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { WindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater'; diff --git a/packages/workspace/src/common/index.ts b/packages/workspace/src/common/index.ts index 914441aa8994f..7d855ab04107d 100644 --- a/packages/workspace/src/common/index.ts +++ b/packages/workspace/src/common/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './workspace-protocol'; diff --git a/packages/workspace/src/common/test/mock-workspace-server.ts b/packages/workspace/src/common/test/mock-workspace-server.ts index 0673fd7e06009..6ac9cb02a5725 100644 --- a/packages/workspace/src/common/test/mock-workspace-server.ts +++ b/packages/workspace/src/common/test/mock-workspace-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { injectable } from '@theia/core/shared/inversify'; import { WorkspaceServer } from '../workspace-protocol'; diff --git a/packages/workspace/src/common/utils.ts b/packages/workspace/src/common/utils.ts index b2c62a9b4d753..9c5106b4a9f52 100644 --- a/packages/workspace/src/common/utils.ts +++ b/packages/workspace/src/common/utils.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // TODO get rid of util files, replace with methods in a responsible class diff --git a/packages/workspace/src/common/workspace-protocol.ts b/packages/workspace/src/common/workspace-protocol.ts index 8df4a3893d0a0..0d89cd41bf5ce 100644 --- a/packages/workspace/src/common/workspace-protocol.ts +++ b/packages/workspace/src/common/workspace-protocol.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export const workspacePath = '/services/workspace'; diff --git a/packages/workspace/src/node/default-workspace-server.spec.ts b/packages/workspace/src/node/default-workspace-server.spec.ts index 8cd844badbc3e..c28ee38956903 100644 --- a/packages/workspace/src/node/default-workspace-server.spec.ts +++ b/packages/workspace/src/node/default-workspace-server.spec.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { Container } from '@theia/core/shared/inversify'; diff --git a/packages/workspace/src/node/default-workspace-server.ts b/packages/workspace/src/node/default-workspace-server.ts index 564b27f6a9286..e291ff04d4e2a 100644 --- a/packages/workspace/src/node/default-workspace-server.ts +++ b/packages/workspace/src/node/default-workspace-server.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import * as path from 'path'; diff --git a/packages/workspace/src/node/index.ts b/packages/workspace/src/node/index.ts index 5dfed2b302526..1d1f183f15117 100644 --- a/packages/workspace/src/node/index.ts +++ b/packages/workspace/src/node/index.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** export * from './default-workspace-server'; diff --git a/packages/workspace/src/node/workspace-backend-module.ts b/packages/workspace/src/node/workspace-backend-module.ts index 79d7c458b834b..5c719b9f03f68 100644 --- a/packages/workspace/src/node/workspace-backend-module.ts +++ b/packages/workspace/src/node/workspace-backend-module.ts @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** import { ContainerModule } from '@theia/core/shared/inversify'; diff --git a/scripts/check-publish.js b/scripts/check-publish.js index 3427fd624a2f3..ef9d7ead42e3d 100644 --- a/scripts/check-publish.js +++ b/scripts/check-publish.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/scripts/check_3pp_licenses.js b/scripts/check_3pp_licenses.js index cef0daa22345e..2dc13b406eef4 100644 --- a/scripts/check_3pp_licenses.js +++ b/scripts/check_3pp_licenses.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check @@ -82,11 +82,11 @@ async function main() { if (dashStatus.status == dashLicensesInternalError) { error(dashError); error('Detected an internal error in dash-licenses - run inconclusive'); - process.exit(dashLicensesInternalError); + process.exit(dashLicensesInternalError); } - warn(dashError); + warn(dashError); } - + const restricted = await getRestrictedDependenciesFromSummary(dashLicensesSummary); if (restricted.length > 0) { if (fs.existsSync(dashLicensesBaseline)) { diff --git a/scripts/compile-references.js b/scripts/compile-references.js index 9569e1b9fca57..be307e542beb8 100644 --- a/scripts/compile-references.js +++ b/scripts/compile-references.js @@ -14,7 +14,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** /** diff --git a/scripts/lerna.js b/scripts/lerna.js index 09346ebef063a..a8999ad2a2195 100644 --- a/scripts/lerna.js +++ b/scripts/lerna.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/scripts/performance/base-package.json b/scripts/performance/base-package.json index 15cb0b2f4f846..670494c3bb9d8 100644 --- a/scripts/performance/base-package.json +++ b/scripts/performance/base-package.json @@ -2,7 +2,7 @@ "private": true, "name": "@theia/example-{{app}}", "version": "{{version}}", - "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0", + "license": "EPL-2.0 OR GPL-2.0-with-classpath-exception", "theia": { "target": "{{app}}", "frontend": { diff --git a/scripts/performance/browser-performance.js b/scripts/performance/browser-performance.js index 6f04088430944..082ad12452dab 100644 --- a/scripts/performance/browser-performance.js +++ b/scripts/performance/browser-performance.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check const puppeteer = require('puppeteer'); diff --git a/scripts/performance/common-performance.js b/scripts/performance/common-performance.js index 8ae450f5a8455..cc497e914a2b2 100644 --- a/scripts/performance/common-performance.js +++ b/scripts/performance/common-performance.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check diff --git a/scripts/performance/electron-performance.js b/scripts/performance/electron-performance.js index 1d138926b9ba9..9ce5f88b5c98e 100644 --- a/scripts/performance/electron-performance.js +++ b/scripts/performance/electron-performance.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check const fsx = require('fs-extra'); diff --git a/scripts/performance/extension-impact.js b/scripts/performance/extension-impact.js index 97cdb19e66c33..0b10a09a36a9f 100644 --- a/scripts/performance/extension-impact.js +++ b/scripts/performance/extension-impact.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check const { execSync, exec } = require('child_process'); diff --git a/scripts/prepare-initial.js b/scripts/prepare-initial.js index 486e1b1897a5b..9e52a5163caf5 100755 --- a/scripts/prepare-initial.js +++ b/scripts/prepare-initial.js @@ -12,7 +12,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** // @ts-check @@ -40,7 +40,7 @@ function replaceCopyrights() { * 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 + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 ********************************************************************************/`); fs.writeFileSync(fileName, result); } catch (e) { @@ -63,7 +63,7 @@ function replaceLicenses() { } if (path.basename(fileName) === 'package.json') { const content = fs.readFileSync(fileName, { encoding: 'UTF-8' }); - const result = content.replace('"license": "Apache-2.0"', '"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"'); + const result = content.replace('"license": "Apache-2.0"', '"license": "EPL-2.0 OR GPL-2.0-with-classpath-exception"'); fs.writeFileSync(fileName, result); } } catch (e) { diff --git a/scripts/replace-license-headers.js b/scripts/replace-license-headers.js index 6362ad89dbc55..22a2388dfd303 100644 --- a/scripts/replace-license-headers.js +++ b/scripts/replace-license-headers.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** const fs = require('fs-extra'); diff --git a/scripts/run-reverse-topo.js b/scripts/run-reverse-topo.js index 2250cec2e41a0..a54b93a0e3f99 100644 --- a/scripts/run-reverse-topo.js +++ b/scripts/run-reverse-topo.js @@ -11,7 +11,7 @@ // 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 +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 // ***************************************************************************** 'use-strict';