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/CHANGELOG.md b/CHANGELOG.md
index 7641ea362bf2b..e4d78f57a49ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
## v1.39.0 - 06/29/2023
+- [debug] added support for conditional exception breakpoints [#12445](https://github.com/eclipse-theia/theia/pull/12445)
+
[Breaking Changes:](#breaking_changes_1.39.0)
- [repo] with the upgrade to Inversify 6.0, a few initialization methods were adjusted. See also [this migration guide entry](https://github.com/eclipse-theia/theia/blob/master/doc/Migration.md#inversify-60). Additionally, other changes include: [#12425](https://github.com/eclipse-theia/theia/pull/12425)
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 6f197f8e1fd60..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": {
@@ -48,6 +48,7 @@
"@theia/scm": "1.38.0",
"@theia/scm-extra": "1.38.0",
"@theia/search-in-workspace": "1.38.0",
+ "@theia/secondary-window": "1.38.0",
"@theia/task": "1.38.0",
"@theia/terminal": "1.38.0",
"@theia/timeline": "1.38.0",
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/electron/tsconfig.json b/examples/electron/tsconfig.json
index a9ea549221e47..ccd4b9fbd4d34 100644
--- a/examples/electron/tsconfig.json
+++ b/examples/electron/tsconfig.json
@@ -107,6 +107,9 @@
{
"path": "../../packages/search-in-workspace"
},
+ {
+ "path": "../../packages/secondary-window"
+ },
{
"path": "../../packages/task"
},
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 a938f76050b74..91ba39196ea5b 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/package.json b/package.json
index 9756f75ff731d..e60d22d59a095 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
],
"theiaPluginsDir": "plugins",
"theiaPlugins": {
- "eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.70.2/file/eclipse-theia.builtin-extension-pack-1.70.2.vsix",
+ "eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.77.0/file/eclipse-theia.builtin-extension-pack-1.77.0.vsix",
"EditorConfig.EditorConfig": "https://open-vsx.org/api/EditorConfig/EditorConfig/0.14.4/file/EditorConfig.EditorConfig-0.14.4.vsix",
"dbaeumer.vscode-eslint": "https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix"
},
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 c3966cc08ff05..677b733750cba 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';
@@ -84,10 +84,9 @@ export class DialogOverlayService implements FrontendApplicationContribution {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
protected readonly dialogs: AbstractDialog[] = [];
+ protected readonly documents: Document[] = [];
constructor() {
- addKeyListener(document.body, Key.ENTER, e => this.handleEnter(e));
- addKeyListener(document.body, Key.ESCAPE, e => this.handleEscape(e));
}
initialize(): void {
@@ -101,6 +100,11 @@ export class DialogOverlayService implements FrontendApplicationContribution {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
push(dialog: AbstractDialog): Disposable {
+ if (this.documents.findIndex(document => document === dialog.node.ownerDocument) < 0) {
+ addKeyListener(dialog.node.ownerDocument.body, Key.ENTER, e => this.handleEnter(e));
+ addKeyListener(dialog.node.ownerDocument.body, Key.ESCAPE, e => this.handleEscape(e));
+ this.documents.push(dialog.node.ownerDocument);
+ }
this.dialogs.unshift(dialog);
return Disposable.create(() => {
const index = this.dialogs.indexOf(dialog);
@@ -147,9 +151,10 @@ export abstract class AbstractDialog extends BaseWidget {
protected activeElement: HTMLElement | undefined;
constructor(
- @inject(DialogProps) protected readonly props: DialogProps
+ protected readonly props: DialogProps,
+ options?: Widget.IOptions
) {
- super();
+ super(options);
this.id = 'theia-dialog-shell';
this.addClass('dialogOverlay');
this.toDispose.push(Disposable.create(() => {
@@ -157,7 +162,7 @@ export abstract class AbstractDialog extends BaseWidget {
Widget.detach(this);
}
}));
- const container = document.createElement('div');
+ const container = this.node.ownerDocument.createElement('div');
container.classList.add('dialogBlock');
if (props.maxWidth === undefined) {
container.setAttribute('style', 'max-width: none');
@@ -166,31 +171,31 @@ export abstract class AbstractDialog extends BaseWidget {
}
this.node.appendChild(container);
- const titleContentNode = document.createElement('div');
+ const titleContentNode = this.node.ownerDocument.createElement('div');
titleContentNode.classList.add('dialogTitle');
container.appendChild(titleContentNode);
- this.titleNode = document.createElement('div');
+ this.titleNode = this.node.ownerDocument.createElement('div');
this.titleNode.textContent = props.title;
titleContentNode.appendChild(this.titleNode);
- this.closeCrossNode = document.createElement('i');
+ this.closeCrossNode = this.node.ownerDocument.createElement('i');
this.closeCrossNode.classList.add(...codiconArray('close'));
this.closeCrossNode.classList.add('closeButton');
titleContentNode.appendChild(this.closeCrossNode);
- this.contentNode = document.createElement('div');
+ this.contentNode = this.node.ownerDocument.createElement('div');
this.contentNode.classList.add('dialogContent');
if (props.wordWrap !== undefined) {
this.contentNode.setAttribute('style', `word-wrap: ${props.wordWrap}`);
}
container.appendChild(this.contentNode);
- this.controlPanel = document.createElement('div');
+ this.controlPanel = this.node.ownerDocument.createElement('div');
this.controlPanel.classList.add('dialogControl');
container.appendChild(this.controlPanel);
- this.errorMessageNode = document.createElement('div');
+ this.errorMessageNode = this.node.ownerDocument.createElement('div');
this.errorMessageNode.classList.add('error');
this.errorMessageNode.setAttribute('style', 'flex: 2');
this.controlPanel.appendChild(this.errorMessageNode);
@@ -199,17 +204,18 @@ export abstract class AbstractDialog extends BaseWidget {
}
protected appendCloseButton(text: string = Dialog.CANCEL): HTMLButtonElement {
- this.closeButton = this.createButton(text);
- this.controlPanel.appendChild(this.closeButton);
- this.closeButton.classList.add('secondary');
- return this.closeButton;
+ return this.closeButton = this.appendButton(text, false);
}
protected appendAcceptButton(text: string = Dialog.OK): HTMLButtonElement {
- this.acceptButton = this.createButton(text);
- this.controlPanel.appendChild(this.acceptButton);
- this.acceptButton.classList.add('main');
- return this.acceptButton;
+ return this.acceptButton = this.appendButton(text, true);
+ }
+
+ protected appendButton(text: string, primary: boolean): HTMLButtonElement {
+ const button = this.createButton(text);
+ this.controlPanel.appendChild(button);
+ button.classList.add(primary ? 'main' : 'secondary');
+ return button;
}
protected createButton(text: string): HTMLButtonElement {
@@ -254,7 +260,7 @@ export abstract class AbstractDialog extends BaseWidget {
if (this.resolve) {
return Promise.reject(new Error('The dialog is already opened.'));
}
- this.activeElement = window.document.activeElement as HTMLElement;
+ this.activeElement = this.node.ownerDocument.activeElement as HTMLElement;
return new Promise((resolve, reject) => {
this.resolve = resolve;
this.reject = reject;
@@ -263,7 +269,7 @@ export abstract class AbstractDialog extends BaseWidget {
this.reject = undefined;
}));
- Widget.attach(this, document.body);
+ Widget.attach(this, this.node.ownerDocument.body);
this.activate();
});
}
@@ -351,8 +357,12 @@ export abstract class AbstractDialog extends BaseWidget {
}
@injectable()
-export class ConfirmDialogProps extends DialogProps {
+export class MessageDialogProps extends DialogProps {
readonly msg: string | HTMLElement;
+}
+
+@injectable()
+export class ConfirmDialogProps extends MessageDialogProps {
readonly cancel?: string;
readonly ok?: string;
}
@@ -383,7 +393,7 @@ export class ConfirmDialog extends AbstractDialog {
protected createMessageNode(msg: string | HTMLElement): HTMLElement {
if (typeof msg === 'string') {
- const messageNode = document.createElement('div');
+ const messageNode = this.node.ownerDocument.createElement('div');
messageNode.textContent = msg;
return messageNode;
}
@@ -401,48 +411,52 @@ export async function confirmExit(): Promise {
return safeToExit === true;
}
-export class ConfirmSaveDialogProps extends ConfirmDialogProps {
+export class ConfirmSaveDialogProps extends MessageDialogProps {
+ readonly cancel: string;
+ readonly dontSave: string;
readonly save: string;
- performSave: () => Promise;
}
-export class ConfirmSaveDialog extends ConfirmDialog {
+// Dialog prompting the user to confirm whether they wish to save changes or not
+export class ConfirmSaveDialog extends AbstractDialog {
+ protected result?: boolean = false;
- protected saveButton: HTMLButtonElement | undefined;
constructor(
@inject(ConfirmSaveDialogProps) protected override readonly props: ConfirmSaveDialogProps
) {
super(props);
+ // Append message and buttons to the dialog
this.contentNode.appendChild(this.createMessageNode(this.props.msg));
- // reorder buttons
- this.controlPanel.childNodes.forEach(child => this.controlPanel.removeChild(child));
- [this.acceptButton, this.closeButton].forEach(child => {
- if (typeof child !== 'undefined') {
- this.controlPanel.appendChild(child);
- }
- });
- this.appendSaveButton(props.save).addEventListener('click', async () => {
- await props.performSave();
- this.acceptButton?.click();
- });
+ this.closeButton = this.appendButtonAndSetResult(props.cancel, false);
+ this.appendButtonAndSetResult(props.dontSave, false, false);
+ this.acceptButton = this.appendButtonAndSetResult(props.save, true, true);
}
- protected appendSaveButton(text: string = Dialog.OK): HTMLButtonElement {
- this.saveButton = this.createButton(text);
- this.controlPanel.appendChild(this.saveButton);
- this.saveButton.classList.add('main');
- return this.saveButton;
+ get value(): boolean | undefined {
+ return this.result;
}
- protected override onActivateRequest(msg: Message): void {
- super.onActivateRequest(msg);
- if (this.saveButton) {
- this.saveButton.focus();
+ protected createMessageNode(msg: string | HTMLElement): HTMLElement {
+ if (typeof msg === 'string') {
+ const messageNode = document.createElement('div');
+ messageNode.textContent = msg;
+ return messageNode;
}
+ return msg;
+ }
+
+ protected appendButtonAndSetResult(text: string, primary: boolean, result?: boolean): HTMLButtonElement {
+ const button = this.appendButton(text, primary);
+ button.addEventListener('click', () => {
+ this.result = result;
+ this.accept();
+ });
+ return button;
}
}
+// Asks the user to confirm whether they want to exit with or without saving the changes
export async function confirmExitWithOrWithoutSaving(captionsToSave: string[], performSave: () => Promise): Promise {
const div: HTMLElement = document.createElement('div');
div.innerText = nls.localizeByDefault("Your changes will be lost if you don't save them.");
@@ -458,15 +472,18 @@ export async function confirmExitWithOrWithoutSaving(captionsToSave: string[], p
});
span.appendChild(document.createElement('br'));
div.appendChild(span);
- const safeToExit = await new ConfirmSaveDialog({
+ const result = await new ConfirmSaveDialog({
title: nls.localizeByDefault('Do you want to save the changes to the following {0} files?', captionsToSave.length),
msg: div,
- ok: nls.localizeByDefault("Don't Save"),
+ dontSave: nls.localizeByDefault("Don't Save"),
save: nls.localizeByDefault('Save All'),
- cancel: Dialog.CANCEL,
- performSave: performSave
+ cancel: Dialog.CANCEL
}).open();
- return safeToExit === true;
+
+ if (result) {
+ await performSave();
+ }
+ return result !== undefined;
} else {
// fallback if not passed with an empty caption-list.
return confirmExit();
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 c0eec0e58c859..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';
@@ -287,14 +287,16 @@ export class ShouldSaveDialog extends AbstractDialog {
constructor(widget: Widget) {
super({
title: nls.localizeByDefault('Do you want to save the changes you made to {0}?', widget.title.label || widget.title.caption)
+ }, {
+ node: widget.node.ownerDocument.createElement('div')
});
- const messageNode = document.createElement('div');
+ const messageNode = this.node.ownerDocument.createElement('div');
messageNode.textContent = nls.localizeByDefault("Your changes will be lost if you don't save them.");
messageNode.setAttribute('style', 'flex: 1 100%; padding-bottom: calc(var(--theia-ui-padding)*3);');
this.contentNode.appendChild(messageNode);
- this.dontSaveButton = this.appendDontSaveButton();
this.appendCloseButton();
+ this.dontSaveButton = this.appendDontSaveButton();
this.appendAcceptButton(nls.localizeByDefault('Save'));
}
diff --git a/packages/core/src/browser/secondary-window-handler.ts b/packages/core/src/browser/secondary-window-handler.ts
index 377bce895cbd8..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');
@@ -23,6 +23,7 @@ import { Emitter } from '../common/event';
import { SecondaryWindowService } from './window/secondary-window-service';
import { KeybindingRegistry } from './keybinding';
import { ColorApplicationContribution } from './color-application-contribution';
+import { StylingService } from './styling-service';
/** Widget to be contained directly in a secondary window. */
class SecondaryWindowRootWidget extends Widget {
@@ -50,8 +51,6 @@ class SecondaryWindowRootWidget extends Widget {
*/
@injectable()
export class SecondaryWindowHandler {
- /** List of currently open secondary windows. Window references should be removed once the window is closed. */
- protected readonly secondaryWindows: Window[] = [];
/** List of widgets in secondary windows. */
protected readonly _widgets: ExtractableWidget[] = [];
@@ -63,6 +62,9 @@ export class SecondaryWindowHandler {
@inject(ColorApplicationContribution)
protected colorAppContribution: ColorApplicationContribution;
+ @inject(StylingService)
+ protected stylingService: StylingService;
+
protected readonly onDidAddWidgetEmitter = new Emitter();
/** Subscribe to get notified when a widget is added to this handler, i.e. the widget was moved to an secondary window . */
readonly onDidAddWidget = this.onDidAddWidgetEmitter.event;
@@ -95,33 +97,6 @@ export class SecondaryWindowHandler {
return;
}
this.applicationShell = shell;
-
- // Set up messaging with secondary windows
- window.addEventListener('message', (event: MessageEvent) => {
- console.trace('Message on main window', event);
- if (event.data.fromSecondary) {
- console.trace('Message comes from secondary window');
- return;
- }
- if (event.data.fromMain) {
- console.trace('Message has mainWindow marker, therefore ignore it');
- return;
- }
-
- // Filter setImmediate messages. Do not forward because these come in with very high frequency.
- // They are not needed in secondary windows because these messages are just a work around
- // to make setImmediate work in the main window: https://developer.mozilla.org/en-US/docs/Web/API/Window/setImmediate
- if (typeof event.data === 'string' && event.data.startsWith('setImmediate')) {
- return;
- }
-
- console.trace('Delegate main window message to secondary windows', event);
- this.secondaryWindows.forEach(secondaryWindow => {
- if (!secondaryWindow.window.closed) {
- secondaryWindow.window.postMessage({ ...event.data, fromMain: true }, '*');
- }
- });
- });
}
/**
@@ -139,21 +114,13 @@ export class SecondaryWindowHandler {
return;
}
- const newWindow = this.secondaryWindowService.createSecondaryWindow(closed => {
- this.applicationShell.closeWidget(widget.id);
- const extIndex = this.secondaryWindows.indexOf(closed);
- if (extIndex > -1) {
- this.secondaryWindows.splice(extIndex, 1);
- }
- });
+ const newWindow = this.secondaryWindowService.createSecondaryWindow(widget, this.applicationShell);
if (!newWindow) {
this.messageService.error('The widget could not be moved to a secondary window because the window creation failed. Please make sure to allow popups.');
return;
}
- this.secondaryWindows.push(newWindow);
-
const mainWindowTitle = document.title;
newWindow.onload = () => {
this.keybindings.registerEventListeners(newWindow);
@@ -168,6 +135,7 @@ export class SecondaryWindowHandler {
return;
}
const unregisterWithColorContribution = this.colorAppContribution.registerWindow(newWindow);
+ const unregisterWithStylingService = this.stylingService.registerWindow(newWindow);
widget.secondaryWindow = newWindow;
const rootWidget = new SecondaryWindowRootWidget();
@@ -182,6 +150,7 @@ export class SecondaryWindowHandler {
// Close the window if the widget is disposed, e.g. by a command closing all widgets.
widget.disposed.connect(() => {
unregisterWithColorContribution.dispose();
+ unregisterWithStylingService.dispose();
this.removeWidget(widget);
if (!newWindow.closed) {
newWindow.close();
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..6f74ce0efb1fa 100644
--- a/packages/core/src/browser/style/view-container.css
+++ b/packages/core/src/browser/style/view-container.css
@@ -11,164 +11,180 @@
* with the GNU Classpath Exception which is available at
* https://www.gnu.org/software/classpath/license.html.
*
- * SPDX-License-Identifier: EPL-2.0 OR 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;
+ flex-basis: fit-content;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.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);
+ overflow: visible !important;
+ 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 c230940a828c4..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';
@@ -21,6 +21,7 @@ import { ColorRegistry } from './color-registry';
import { DecorationStyle } from './decoration-style';
import { FrontendApplicationContribution } from './frontend-application';
import { ThemeService } from './theming';
+import { Disposable } from '../common';
export const StylingParticipant = Symbol('StylingParticipant');
@@ -40,8 +41,7 @@ export interface CssStyleCollector {
@injectable()
export class StylingService implements FrontendApplicationContribution {
-
- protected cssElement = DecorationStyle.createStyleElement('contributedColorTheme');
+ protected cssElements = new Map();
@inject(ThemeService)
protected readonly themeService: ThemeService;
@@ -53,11 +53,22 @@ export class StylingService implements FrontendApplicationContribution {
protected readonly themingParticipants: ContributionProvider;
onStart(): void {
- this.applyStyling(this.themeService.getCurrentTheme());
- this.themeService.onDidColorThemeChange(e => this.applyStyling(e.newTheme));
+ this.registerWindow(window);
+ this.themeService.onDidColorThemeChange(e => this.applyStylingToWindows(e.newTheme));
+ }
+
+ registerWindow(win: Window): Disposable {
+ const cssElement = DecorationStyle.createStyleElement('contributedColorTheme', win.document.head);
+ this.cssElements.set(win, cssElement);
+ this.applyStyling(this.themeService.getCurrentTheme(), cssElement);
+ return Disposable.create(() => this.cssElements.delete(win));
+ }
+
+ protected applyStylingToWindows(theme: Theme): void {
+ this.cssElements.forEach(cssElement => this.applyStyling(theme, cssElement));
}
- protected applyStyling(theme: Theme): void {
+ protected applyStyling(theme: Theme, cssElement: HTMLStyleElement): void {
const rules: string[] = [];
const colorTheme: ColorTheme = {
type: theme.type,
@@ -71,6 +82,6 @@ export class StylingService implements FrontendApplicationContribution {
themingParticipant.registerThemeStyle(colorTheme, styleCollector);
}
const fullCss = rules.join('\n');
- this.cssElement.innerText = fullCss;
+ cssElement.innerText = fullCss;
}
}
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 02af3612c6fd8..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 */
@@ -115,6 +115,10 @@ export class BaseWidget extends Widget {
protected scrollBar?: PerfectScrollbar;
protected scrollOptions?: PerfectScrollbar.Options;
+ constructor(options?: Widget.IOptions) {
+ super(options);
+ }
+
override dispose(): void {
if (this.isDisposed) {
return;
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 643afe79d9741..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,11 +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
// *****************************************************************************
import { inject, injectable, postConstruct } from 'inversify';
import { SecondaryWindowService } from './secondary-window-service';
import { WindowService } from './window-service';
+import { ExtractableWidget } from '../widgets';
+import { ApplicationShell } from '../shell';
+import { Saveable } from '../saveable';
@injectable()
export class DefaultSecondaryWindowService implements SecondaryWindowService {
@@ -37,6 +40,33 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
@postConstruct()
init(): void {
+ // Set up messaging with secondary windows
+ window.addEventListener('message', (event: MessageEvent) => {
+ console.trace('Message on main window', event);
+ if (event.data.fromSecondary) {
+ console.trace('Message comes from secondary window');
+ return;
+ }
+ if (event.data.fromMain) {
+ console.trace('Message has mainWindow marker, therefore ignore it');
+ return;
+ }
+
+ // Filter setImmediate messages. Do not forward because these come in with very high frequency.
+ // They are not needed in secondary windows because these messages are just a work around
+ // to make setImmediate work in the main window: https://developer.mozilla.org/en-US/docs/Web/API/Window/setImmediate
+ if (typeof event.data === 'string' && event.data.startsWith('setImmediate')) {
+ return;
+ }
+
+ console.trace('Delegate main window message to secondary windows', event);
+ this.secondaryWindows.forEach(secondaryWindow => {
+ if (!secondaryWindow.window.closed) {
+ secondaryWindow.window.postMessage({ ...event.data, fromMain: true }, '*');
+ }
+ });
+ });
+
// Close all open windows when the main window is closed.
this.windowService.onUnload(() => {
// Iterate backwards because calling window.close might remove the window from the array
@@ -46,33 +76,52 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
});
}
- createSecondaryWindow(onClose?: (closedWin: Window) => void): Window | undefined {
- const win = this.doCreateSecondaryWindow(onClose);
+ createSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined {
+ const win = this.doCreateSecondaryWindow(widget, shell);
if (win) {
this.secondaryWindows.push(win);
+ win.addEventListener('close', () => {
+ const extIndex = this.secondaryWindows.indexOf(win);
+ if (extIndex > -1) {
+ this.secondaryWindows.splice(extIndex, 1);
+ };
+ });
}
return win;
}
- protected doCreateSecondaryWindow(onClose?: (closedWin: Window) => void): Window | undefined {
- const win = window.open(DefaultSecondaryWindowService.SECONDARY_WINDOW_URL, this.nextWindowId(), 'popup');
- if (win) {
- // Add the unload listener after the dom content was loaded because otherwise the unload listener is called already on open in some browsers (e.g. Chrome).
- win.addEventListener('DOMContentLoaded', () => {
- win.addEventListener('unload', () => {
- this.handleWindowClosed(win, onClose);
- });
- });
+ protected findWindow(windowName: string): Window | undefined {
+ for (const w of this.secondaryWindows) {
+ if (w.name === windowName) {
+ return w;
+ }
}
- return win ?? undefined;
+ return undefined;
}
- protected handleWindowClosed(win: Window, onClose?: (closedWin: Window) => void): void {
- const extIndex = this.secondaryWindows.indexOf(win);
- if (extIndex > -1) {
- this.secondaryWindows.splice(extIndex, 1);
- };
- onClose?.(win);
+ protected doCreateSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined {
+ const newWindow = window.open(DefaultSecondaryWindowService.SECONDARY_WINDOW_URL, this.nextWindowId(), 'popup') ?? undefined;
+ if (newWindow) {
+ newWindow.addEventListener('DOMContentLoaded', () => {
+ newWindow.addEventListener('beforeunload', evt => {
+ const saveable = Saveable.get(widget);
+ const wouldLoseState = !!saveable && saveable.dirty && saveable.autoSave === 'off';
+ if (wouldLoseState) {
+ evt.returnValue = '';
+ evt.preventDefault();
+ return 'non-empty';
+ }
+ }, { capture: true });
+
+ newWindow.addEventListener('close', () => {
+ const saveable = Saveable.get(widget);
+ shell.closeWidget(widget.id, {
+ save: !!saveable && saveable.dirty && saveable.autoSave !== 'off'
+ });
+ });
+ });
+ }
+ return newWindow;
}
focus(win: Window): void {
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 784e32bf974e2..84e45cc9cfae8 100644
--- a/packages/core/src/browser/window/secondary-window-service.ts
+++ b/packages/core/src/browser/window/secondary-window-service.ts
@@ -11,9 +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 { ApplicationShell } from '../shell';
+import { ExtractableWidget } from '../widgets';
+
export const SecondaryWindowService = Symbol('SecondaryWindowService');
/**
@@ -29,7 +32,7 @@ export interface SecondaryWindowService {
* @param onClose optional callback that is invoked when the secondary window is closed
* @returns the created window or `undefined` if it could not be created
*/
- createSecondaryWindow(onClose?: (win: Window) => void): Window | undefined;
+ createSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined;
/** Handles focussing the given secondary window in the browser and on Electron. */
focus(win: Window): void;
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 b6886d908f002..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 */
@@ -51,7 +51,7 @@ export interface RequestMessage {
export interface NotificationMessage {
type: RpcMessageType.Notification;
- id: number;
+ id?: number;
method: string;
args: any[];
}
@@ -111,7 +111,7 @@ export interface RpcMessageDecoder {
export interface RpcMessageEncoder {
cancel(buf: WriteBuffer, requestId: number): void;
- notification(buf: WriteBuffer, requestId: number, method: string, args: any[]): void
+ notification(buf: WriteBuffer, method: string, args: any[], id?: number): void
request(buf: WriteBuffer, requestId: number, method: string, args: any[]): void
@@ -130,8 +130,8 @@ export class MsgPackMessageEncoder implements RpcMessageEncoder {
cancel(buf: WriteBuffer, requestId: number): void {
this.encode(buf, { type: RpcMessageType.Cancel, id: requestId });
}
- notification(buf: WriteBuffer, requestId: number, method: string, args: any[]): void {
- this.encode(buf, { type: RpcMessageType.Notification, id: requestId, method, args });
+ notification(buf: WriteBuffer, method: string, args: any[], id?: number): void {
+ this.encode(buf, { type: RpcMessageType.Notification, method, args, id });
}
request(buf: WriteBuffer, requestId: number, method: string, args: any[]): void {
this.encode(buf, { type: RpcMessageType.Request, id: requestId, method, args });
diff --git a/packages/core/src/common/message-rpc/rpc-protocol.ts b/packages/core/src/common/message-rpc/rpc-protocol.ts
index 4dbf422e0b877..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 */
@@ -77,7 +77,11 @@ export class RpcProtocol {
this.encoder = options.encoder ?? new MsgPackMessageEncoder();
this.decoder = options.decoder ?? new MsgPackMessageDecoder();
this.toDispose.push(this.onNotificationEmitter);
- channel.onClose(() => this.toDispose.dispose());
+ channel.onClose(event => {
+ this.pendingRequests.forEach(pending => pending.reject(new Error(event.reason)));
+ this.pendingRequests.clear();
+ this.toDispose.dispose();
+ });
this.toDispose.push(channel.onMessage(readBuffer => this.handleMessage(this.decoder.parse(readBuffer()))));
this.mode = options.mode ?? 'default';
@@ -98,7 +102,7 @@ export class RpcProtocol {
return;
}
case RpcMessageType.Notification: {
- this.handleNotify(message.id, message.method, message.args);
+ this.handleNotify(message.method, message.args, message.id);
return;
}
}
@@ -179,7 +183,7 @@ export class RpcProtocol {
}
const output = this.channel.getWriteBuffer();
- this.encoder.notification(output, this.nextMessageId++, method, args);
+ this.encoder.notification(output, method, args, this.nextMessageId++);
output.commit();
}
@@ -226,7 +230,7 @@ export class RpcProtocol {
}
}
- protected async handleNotify(id: number, method: string, args: any[]): Promise {
+ protected async handleNotify(method: string, args: any[], id?: number): Promise {
if (this.toDispose.disposed) {
return;
}
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 a18f54305af96..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 */
@@ -23,6 +23,7 @@ import { Emitter, Event } from '../event';
import { Channel } from '../message-rpc/channel';
import { RequestHandler, RpcProtocol } from '../message-rpc/rpc-protocol';
import { ConnectionHandler } from './handler';
+import { Deferred } from '../promise-util';
export type JsonRpcServer = Disposable & {
/**
@@ -55,11 +56,11 @@ export class JsonRpcConnectionHandler implements ConnectionHan
}
}
/**
- * Factory for creating a new {@link RpcConnection} for a given chanel and {@link RequestHandler}.
+ * Factory for creating a new {@link RpcProtocol} for a given chanel and {@link RequestHandler}.
*/
-export type RpcConnectionFactory = (channel: Channel, requestHandler: RequestHandler) => RpcProtocol;
+export type RpcProtocolFactory = (channel: Channel, requestHandler: RequestHandler) => RpcProtocol;
-const defaultRPCConnectionFactory: RpcConnectionFactory = (channel, requestHandler) => new RpcProtocol(channel, requestHandler);
+const defaultRpcProtocolFactory: RpcProtocolFactory = (channel, requestHandler) => new RpcProtocol(channel, requestHandler);
/**
* Factory for JSON-RPC proxy objects.
@@ -109,8 +110,7 @@ export class JsonRpcProxyFactory implements ProxyHandler {
protected readonly onDidOpenConnectionEmitter = new Emitter();
protected readonly onDidCloseConnectionEmitter = new Emitter();
- protected connectionPromiseResolve: (connection: RpcProtocol) => void;
- protected connectionPromise: Promise;
+ protected rpcDeferred: Deferred;
/**
* Build a new JsonRpcProxyFactory.
@@ -118,16 +118,14 @@ export class JsonRpcProxyFactory implements ProxyHandler {
* @param target - The object to expose to JSON-RPC methods calls. If this
* is omitted, the proxy won't be able to handle requests, only send them.
*/
- constructor(public target?: any, protected rpcConnectionFactory = defaultRPCConnectionFactory) {
+ constructor(public target?: any, protected rpcProtocolFactory = defaultRpcProtocolFactory) {
this.waitForConnection();
}
protected waitForConnection(): void {
- this.connectionPromise = new Promise(resolve =>
- this.connectionPromiseResolve = resolve
- );
- this.connectionPromise.then(connection => {
- connection.channel.onClose(() => {
+ this.rpcDeferred = new Deferred();
+ this.rpcDeferred.promise.then(protocol => {
+ protocol.channel.onClose(() => {
this.onDidCloseConnectionEmitter.fire(undefined);
// Wait for connection in case the backend reconnects
this.waitForConnection();
@@ -143,10 +141,10 @@ export class JsonRpcProxyFactory implements ProxyHandler {
* response.
*/
listen(channel: Channel): void {
- const connection = this.rpcConnectionFactory(channel, (meth, args) => this.onRequest(meth, ...args));
- connection.onNotification(event => this.onNotification(event.method, ...event.args));
+ const protocol = this.rpcProtocolFactory(channel, (meth, args) => this.onRequest(meth, ...args));
+ protocol.onNotification(event => this.onNotification(event.method, ...event.args));
- this.connectionPromiseResolve(connection);
+ this.rpcDeferred.resolve(protocol);
}
/**
@@ -249,7 +247,7 @@ export class JsonRpcProxyFactory implements ProxyHandler {
return (...args: any[]) => {
const method = p.toString();
const capturedError = new Error(`Request '${method}' failed`);
- return this.connectionPromise.then(connection =>
+ return this.rpcDeferred.promise.then(connection =>
new Promise((resolve, reject) => {
try {
if (isNotify) {
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 33b816c592aa9..829e66c55c97f 100644
--- a/packages/core/src/electron-browser/preload.ts
+++ b/packages/core/src/electron-browser/preload.ts
@@ -11,8 +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
//
+import { IpcRendererEvent } from '@theia/electron/shared/electron';
import { Disposable } from '../common/disposable';
import { StopReason } from '../common/frontend-application-state';
import { NativeKeyboardLayout } from '../common/keyboard/keyboard-layout-provider';
@@ -24,7 +25,7 @@ import {
CHANNEL_ON_WINDOW_EVENT, CHANNEL_GET_ZOOM_LEVEL, CHANNEL_SET_ZOOM_LEVEL, CHANNEL_IS_FULL_SCREENABLE, CHANNEL_TOGGLE_FULL_SCREEN,
CHANNEL_IS_FULL_SCREEN, CHANNEL_SET_MENU_BAR_VISIBLE, CHANNEL_REQUEST_CLOSE, CHANNEL_SET_TITLE_STYLE, CHANNEL_RESTART,
CHANNEL_REQUEST_RELOAD, CHANNEL_APP_STATE_CHANGED, CHANNEL_SHOW_ITEM_IN_FOLDER, CHANNEL_READ_CLIPBOARD, CHANNEL_WRITE_CLIPBOARD,
- CHANNEL_KEYBOARD_LAYOUT_CHANGED, CHANNEL_IPC_CONNECTION, InternalMenuDto
+ CHANNEL_KEYBOARD_LAYOUT_CHANGED, CHANNEL_IPC_CONNECTION, InternalMenuDto, CHANNEL_REQUEST_SECONDARY_CLOSE
} from '../electron-common/electron-api';
// eslint-disable-next-line import/no-extraneous-dependencies
@@ -138,6 +139,25 @@ const api: TheiaCoreAPI = {
});
},
+ setSecondaryWindowCloseRequestHandler(windowName: string, handler: () => Promise): void {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const listener: (event: IpcRendererEvent, ...args: any[]) => void = async (event, name, confirmChannel, cancelChannel) => {
+ if (name === windowName) {
+ try {
+ if (await handler()) {
+ event.sender.send(confirmChannel);
+ ipcRenderer.removeListener(CHANNEL_REQUEST_SECONDARY_CLOSE, listener);
+ return;
+ };
+ } catch (e) {
+ console.warn('exception in close handler ', e);
+ }
+ event.sender.send(cancelChannel);
+ }
+ };
+ ipcRenderer.on(CHANNEL_REQUEST_SECONDARY_CLOSE, listener);
+ },
+
toggleDevTools: function (): void {
ipcRenderer.send(CHANNEL_TOGGLE_DEVTOOLS);
},
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 fb0aed2ef831a..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,11 +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 { injectable } from 'inversify';
import { DefaultSecondaryWindowService } from '../../browser/window/default-secondary-window-service';
+import { ApplicationShell, ExtractableWidget } from 'src/browser';
@injectable()
export class ElectronSecondaryWindowService extends DefaultSecondaryWindowService {
@@ -23,11 +24,16 @@ export class ElectronSecondaryWindowService extends DefaultSecondaryWindowServic
window.electronTheiaCore.focusWindow(win.name);
}
- protected override doCreateSecondaryWindow(onClose?: (closedWin: Window) => void): Window | undefined {
- const w = super.doCreateSecondaryWindow(onClose);
+ protected override doCreateSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined {
+ const w = super.doCreateSecondaryWindow(widget, shell);
if (w) {
window.electronTheiaCore.setMenuBarVisible(false, w.name);
+ window.electronTheiaCore.setSecondaryWindowCloseRequestHandler(w.name, () => this.canClose(widget, shell));
}
return w;
}
+ private async canClose(widget: ExtractableWidget, shell: ApplicationShell): Promise {
+ await shell.closeWidget(widget.id, undefined);
+ return widget.isDisposed;
+ }
}
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 5ebc5cc13d43d..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';
@@ -64,6 +64,8 @@ export interface TheiaCoreAPI {
onWindowEvent(event: WindowEvent, handler: () => void): Disposable;
setCloseRequestHandler(handler: (reason: StopReason) => Promise): void;
+ setSecondaryWindowCloseRequestHandler(windowName: string, handler: () => Promise): void;
+
toggleDevTools(): void;
getZoomLevel(): Promise;
setZoomLevel(desired: number): void;
@@ -121,6 +123,8 @@ export const CHANNEL_IS_FULL_SCREENABLE = 'IsFullScreenable';
export const CHANNEL_IS_FULL_SCREEN = 'IsFullScreen';
export const CHANNEL_TOGGLE_FULL_SCREEN = 'ToggleFullScreen';
+export const CHANNEL_REQUEST_SECONDARY_CLOSE = 'RequestSecondaryClose';
+
export const CHANNEL_REQUEST_CLOSE = 'RequestClose';
export const CHANNEL_REQUEST_RELOAD = 'RequestReload';
export const CHANNEL_RESTART = 'Restart';
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 0061c4acb1b2f..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 {
@@ -49,7 +49,8 @@ import {
InternalMenuDto,
CHANNEL_SET_MENU_BAR_VISIBLE,
CHANNEL_TOGGLE_FULL_SCREEN,
- CHANNEL_IS_MAXIMIZED
+ CHANNEL_IS_MAXIMIZED,
+ CHANNEL_REQUEST_SECONDARY_CLOSE
} from '../electron-common/electron-api';
import { ElectronMainApplication, ElectronMainApplicationContribution } from './electron-main-application';
import { Disposable, DisposableCollection, isOSX, MaybePromise } from '../common';
@@ -267,6 +268,23 @@ export namespace TheiaRendererAPI {
}).finally(() => disposables.dispose());
}
+ export function requestSecondaryClose(mainWindow: WebContents, secondaryWindow: WebContents): Promise {
+ const channelNr = nextReplyChannel++;
+ const confirmChannel = `confirm-${channelNr}`;
+ const cancelChannel = `cancel-${channelNr}`;
+ const disposables = new DisposableCollection();
+
+ return new Promise(resolve => {
+ mainWindow.send(CHANNEL_REQUEST_SECONDARY_CLOSE, secondaryWindow.mainFrame.name, confirmChannel, cancelChannel);
+ createDisposableListener(ipcMain, confirmChannel, e => {
+ resolve(true);
+ }, disposables);
+ createDisposableListener(ipcMain, cancelChannel, e => {
+ resolve(false);
+ }, disposables);
+ }).finally(() => disposables.dispose());
+ }
+
export function onRequestReload(wc: WebContents, handler: () => void): Disposable {
return createWindowListener(wc, CHANNEL_REQUEST_RELOAD, handler);
}
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 a61be0ac2b5d8..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';
@@ -44,6 +44,12 @@ export const TheiaBrowserWindowOptions = Symbol('TheiaBrowserWindowOptions');
export const WindowApplicationConfig = Symbol('WindowApplicationConfig');
export type WindowApplicationConfig = FrontendApplicationConfig;
+enum ClosingState {
+ initial,
+ inProgress,
+ readyToClose
+}
+
@injectable()
export class TheiaElectronWindow {
@inject(TheiaBrowserWindowOptions) protected readonly options: TheiaBrowserWindowOptions;
@@ -75,8 +81,32 @@ export class TheiaElectronWindow {
this.attachCloseListeners();
this.trackApplicationState();
this.attachReloadListener();
+ this.attachSecondaryWindowListener();
}
+ protected attachSecondaryWindowListener(): void {
+ createDisposableListener(this._window.webContents, 'did-create-window', (newWindow: BrowserWindow) => {
+ let closingState = ClosingState.initial;
+ newWindow.on('close', event => {
+ if (closingState === ClosingState.initial) {
+ closingState = ClosingState.inProgress;
+ event.preventDefault();
+ TheiaRendererAPI.requestSecondaryClose(this._window.webContents, newWindow.webContents).then(shouldClose => {
+ if (shouldClose) {
+ closingState = ClosingState.readyToClose;
+ newWindow.close();
+ } else {
+ closingState = ClosingState.initial;
+ }
+ });
+ } else if (closingState === ClosingState.inProgress) {
+ // When the extracted widget is disposed programmatically, a dispose listener on it will try to close the window.
+ // if we dispose the widget because of closing the window, we'll get a recursive call to window.close()
+ event.preventDefault();
+ }
+ });
+ });
+ }
/**
* Only show the window when the content is ready.
*/
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 2f763682d4c10..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';
@@ -201,6 +201,14 @@ export class BreakpointManager extends MarkerManager {
}
}
+ updateExceptionBreakpoint(filter: string, options: Partial>): void {
+ const breakpoint = this.getExceptionBreakpoint(filter);
+ if (breakpoint) {
+ Object.assign(breakpoint, options);
+ this.fireOnDidChangeMarkers(BreakpointManager.EXCEPTION_URI);
+ }
+ }
+
protected functionBreakpoints: FunctionBreakpoint[] = [];
getFunctionBreakpoints(): FunctionBreakpoint[] {
diff --git a/packages/debug/src/browser/breakpoint/breakpoint-marker.ts b/packages/debug/src/browser/breakpoint/breakpoint-marker.ts
index f783a6d6a2deb..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';
@@ -55,12 +55,14 @@ export namespace BreakpointMarker {
export interface ExceptionBreakpoint {
enabled: boolean;
+ condition?: string;
raw: DebugProtocol.ExceptionBreakpointsFilter;
}
export namespace ExceptionBreakpoint {
export function create(data: DebugProtocol.ExceptionBreakpointsFilter, origin?: ExceptionBreakpoint): ExceptionBreakpoint {
return {
enabled: origin ? origin.enabled : false,
+ condition: origin ? origin.condition : undefined,
raw: {
...(origin && origin.raw),
...data
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 27d745ed2966f..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 {
@@ -55,6 +55,7 @@ import { DebugBreakpoint } from './model/debug-breakpoint';
import { nls } from '@theia/core/lib/common/nls';
import { DebugInstructionBreakpoint } from './model/debug-instruction-breakpoint';
import { DebugConfiguration } from '../common/debug-configuration';
+import { DebugExceptionBreakpoint } from './view/debug-exception-breakpoint';
export namespace DebugMenus {
export const DEBUG = [...MAIN_MENU_BAR, '6_debug'];
@@ -212,6 +213,11 @@ export namespace DebugCommands {
originalLabel: 'Edit Logpoint...',
label: nlsEditBreakpoint('Logpoint')
}, '', DEBUG_CATEGORY_KEY);
+ export const EDIT_BREAKPOINT_CONDITION = Command.toLocalizedCommand({
+ id: 'debug.breakpoint.editCondition',
+ category: DEBUG_CATEGORY,
+ label: 'Edit Condition...'
+ }, '', DEBUG_CATEGORY_KEY);
export const REMOVE_BREAKPOINT = Command.toLocalizedCommand({
id: 'debug.breakpoint.remove',
category: DEBUG_CATEGORY,
@@ -596,7 +602,8 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
registerMenuActions(DebugBreakpointsWidget.EDIT_MENU,
DebugCommands.EDIT_BREAKPOINT,
- DebugCommands.EDIT_LOGPOINT
+ DebugCommands.EDIT_LOGPOINT,
+ DebugCommands.EDIT_BREAKPOINT_CONDITION
);
registerMenuActions(DebugBreakpointsWidget.REMOVE_MENU,
DebugCommands.REMOVE_BREAKPOINT,
@@ -787,6 +794,16 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
isEnabled: () => !!this.selectedLogpoint,
isVisible: () => !!this.selectedLogpoint
});
+ registry.registerCommand(DebugCommands.EDIT_BREAKPOINT_CONDITION, {
+ execute: async () => {
+ const { selectedExceptionBreakpoint } = this;
+ if (selectedExceptionBreakpoint) {
+ await selectedExceptionBreakpoint.editCondition();
+ }
+ },
+ isEnabled: () => !!this.selectedExceptionBreakpoint?.data.raw.supportsCondition,
+ isVisible: () => !!this.selectedExceptionBreakpoint?.data.raw.supportsCondition
+ });
registry.registerCommand(DebugCommands.REMOVE_BREAKPOINT, {
execute: () => {
const selectedBreakpoint = this.selectedSettableBreakpoint;
@@ -1216,6 +1233,11 @@ export class DebugFrontendApplicationContribution extends AbstractViewContributi
return this.selectedAnyBreakpoint;
}
}
+ get selectedExceptionBreakpoint(): DebugExceptionBreakpoint | undefined {
+ const { breakpoints } = this;
+ const selectedElement = breakpoints && breakpoints.selectedElement;
+ return selectedElement instanceof DebugExceptionBreakpoint ? selectedElement : undefined;
+ }
get selectedSettableBreakpoint(): DebugFunctionBreakpoint | DebugInstructionBreakpoint | DebugSourceBreakpoint | undefined {
const selected = this.selectedAnyBreakpoint;
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 ddad3d78757e5..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 */
@@ -43,6 +43,7 @@ import { DebugContribution } from './debug-contribution';
import { Deferred, waitForEvent } from '@theia/core/lib/common/promise-util';
import { WorkspaceService } from '@theia/workspace/lib/browser';
import { DebugInstructionBreakpoint } from './model/debug-instruction-breakpoint';
+import { nls } from '@theia/core';
export enum DebugState {
Inactive,
@@ -692,13 +693,21 @@ export class DebugSession implements CompositeTreeElement {
}
protected async sendExceptionBreakpoints(): Promise {
- const filters = [];
+ const filters: string[] = [];
+ const filterOptions: DebugProtocol.ExceptionFilterOptions[] | undefined = this.capabilities.supportsExceptionFilterOptions ? [] : undefined;
for (const breakpoint of this.breakpoints.getExceptionBreakpoints()) {
if (breakpoint.enabled) {
- filters.push(breakpoint.raw.filter);
+ if (filterOptions) {
+ filterOptions.push({
+ filterId: breakpoint.raw.filter,
+ condition: breakpoint.condition
+ });
+ } else {
+ filters.push(breakpoint.raw.filter);
+ }
}
}
- await this.sendRequest('setExceptionBreakpoints', { filters });
+ await this.sendRequest('setExceptionBreakpoints', { filters, filterOptions });
}
protected async sendFunctionBreakpoints(affectedUri: URI): Promise {
@@ -860,6 +869,7 @@ export class DebugSession implements CompositeTreeElement {
render(): React.ReactNode {
let label = '';
+ const state = this.state === DebugState.Stopped ? nls.localizeByDefault('Paused') : nls.localizeByDefault('Running');
const child = this.getSingleChildSession();
if (child && child.configuration.compact) {
// Inlines the name of the child debug session
@@ -867,7 +877,7 @@ export class DebugSession implements CompositeTreeElement {
}
return