From 49f2024ed16aef9a27227a77b6e3807eaa3095f1 Mon Sep 17 00:00:00 2001 From: Vincent Fugnitto Date: Thu, 25 Oct 2018 08:11:22 -0400 Subject: [PATCH 1/6] Add helper function to clear local storage when full Added an additional button to clear local storage for when the local storage test fails, and we inform users that their storage may exceed its quota. Signed-off-by: Vincent Fugnitto --- packages/core/src/browser/storage-service.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/core/src/browser/storage-service.ts b/packages/core/src/browser/storage-service.ts index 9bff2d75215b3..bd729d28a591e 100644 --- a/packages/core/src/browser/storage-service.ts +++ b/packages/core/src/browser/storage-service.ts @@ -84,15 +84,18 @@ export class LocalStorageService implements StorageService { return `theia:${pathname}:${key}`; } - private showDiskQuotaExceededMessage() { + private async showDiskQuotaExceededMessage(): Promise { const READ_INSTRUCTIONS_ACTION = 'Read Instructions'; + const CLEAR_STORAGE_ACTION = 'Clear Local Storage'; const ERROR_MESSAGE = `Your preferred browser's local storage is almost full. To be able to save your current workspace layout or data, you may need to free up some space. You can refer to Theia's documentation page for instructions on how to manually clean - your browser's local storage.`; - this.messageService.warn(ERROR_MESSAGE, READ_INSTRUCTIONS_ACTION).then(selected => { + your browser's local storage or choose to clear all.`; + this.messageService.warn(ERROR_MESSAGE, READ_INSTRUCTIONS_ACTION, CLEAR_STORAGE_ACTION).then(async selected => { if (READ_INSTRUCTIONS_ACTION === selected) { window.open('https://github.com/theia-ide/theia/wiki/Cleaning-Local-Storage'); + } else if (CLEAR_STORAGE_ACTION === selected) { + this.clearStorage(); } }); } @@ -102,11 +105,9 @@ export class LocalStorageService implements StorageService { * If we are close to the limit, use a dialog to notify the user. */ private testLocalStorage(): void { - const array = new Array(60000); // size: * 5 = ~ 300K const keyTest = this.prefix('Test'); - try { - this.storage[keyTest] = JSON.stringify(array); + this.storage[keyTest] = JSON.stringify(new Array(60000)); } catch (error) { this.showDiskQuotaExceededMessage(); } finally { @@ -114,4 +115,8 @@ export class LocalStorageService implements StorageService { } } + private clearStorage(): void { + this.storage.clear(); + } + } From 241e17d073951b2d2cad8a7c9316980c39c368d2 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 24 Oct 2018 13:56:05 -0400 Subject: [PATCH 2/6] Improve prepare-travis for Windows When running "yarn" on Windows, we get spurious diffs in .travis.yml. The first reason is that since we use path.join, it replaces all / with \. Fix this by joining with '/' all the time. Then, we get some git warnings about LF/CRLF. The reason is that with git on Windows, it's common to use core.autocrlf=true. This means that files are saved with \n end of lines in git objects, but those are replaced with \r\n when checked out on Windows. When we re-generate .travis.yml on Windows, we currently, replace the \r\n (in the checked out version of the file) with single \n. Then, git warns us that our file changed, but not really: $ git status .travis.yml ... modified: .travis.yml ... $ git diff .travis.yml warning: LF will be replaced by CRLF in .travis.yml. The file will have its original line endings in your working directory. Fix this by using platform-specific end of lines. With this, running "node scripts/prepare-travis" on a clean Theia repository results in no changes to .travis.yml, on Linux or Windows. Fixes #3171 Change-Id: I15e6e1ffed6be4aa3830c1c59167f7f9e91d50a3 Signed-off-by: Simon Marchi --- scripts/prepare-travis | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/prepare-travis b/scripts/prepare-travis index 6064a622e5c04..d622e29b5e37b 100644 --- a/scripts/prepare-travis +++ b/scripts/prepare-travis @@ -23,13 +23,14 @@ const fs = require('fs'); const path = require('path'); const child_process = require('child_process'); +const os = require('os'); const directories = ['node_modules']; const workspaces = JSON.parse(JSON.parse(child_process.execSync('yarn workspaces info --json').toString()).data); for (const name in workspaces) { const workspace = workspaces[name]; - const nodeModulesPath = path.join(workspace.location, 'node_modules'); + const nodeModulesPath = [workspace.location, 'node_modules'].join('/'); if (fs.existsSync(path.join(process.cwd(), nodeModulesPath))) { directories.push(nodeModulesPath); } @@ -39,7 +40,7 @@ const travisPath = path.resolve(__dirname, '../.travis.yml'); const content = fs.readFileSync(travisPath).toString(); const startIndex = content.indexOf('# start_cache_directories') + '# start_cache_directories'.length; const endIndex = content.indexOf('# end_cache_directories'); -const result = content.substr(0, startIndex) + - directories.sort((d, d2) => d.localeCompare(d2)).map(d => `\n - ${d}`).join('') + - '\n' + content.substr(endIndex); +const result = content.substr(0, startIndex) + os.EOL + + directories.sort((d, d2) => d.localeCompare(d2)).map(d => ` - ${d}${os.EOL}`).join('') + + content.substr(endIndex); fs.writeFileSync(travisPath, result); From 7df95eb53a37786728f57125df51e2b0837c5791 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Wed, 24 Oct 2018 16:12:35 +0200 Subject: [PATCH 3/6] GH-3268: Disabled the icons in the main menu. They're unsupported. We cannot use the CSS class name of the `font-awesome` icons. Signed-off-by: Akos Kitta --- .../core/src/electron-browser/menu/electron-main-menu-factory.ts | 1 - 1 file changed, 1 deletion(-) 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 ea14dbdcfa562..e105ff3ebdf87 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 @@ -100,7 +100,6 @@ export class ElectronMainMenuFactory { items.push({ id: menu.id, label: menu.label, - icon: menu.icon, type: this.commandRegistry.getToggledHandler(commandId) ? 'checkbox' : 'normal', checked: this.commandRegistry.isToggled(commandId), enabled: true, // https://github.com/theia-ide/theia/issues/446 From c86a33b9ee0e5bb1dc49c66def123ffb2cadbfe4 Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Thu, 25 Oct 2018 16:11:13 -0400 Subject: [PATCH 4/6] publish v0.3.16 Signed-off-by: Marc Dumais --- CHANGELOG.md | 8 ++ dev-packages/application-manager/package.json | 6 +- dev-packages/application-package/package.json | 4 +- dev-packages/cli/package.json | 4 +- dev-packages/ext-scripts/package.json | 2 +- examples/browser/package.json | 84 +++++++++---------- examples/electron/package.json | 84 +++++++++---------- lerna.json | 2 +- packages/bunyan/package.json | 6 +- packages/callhierarchy/package.json | 12 +-- packages/console/package.json | 6 +- packages/core/package.json | 6 +- packages/cpp/package.json | 20 ++--- packages/debug-nodejs/package.json | 10 +-- packages/debug/package.json | 24 +++--- packages/editor/package.json | 10 +-- packages/editorconfig/package.json | 10 +-- packages/extension-manager/package.json | 10 +-- packages/file-search/package.json | 12 +-- packages/filesystem/package.json | 6 +- packages/git/package.json | 16 ++-- packages/java/package.json | 12 +-- packages/json/package.json | 10 +-- packages/keymaps/package.json | 12 +-- packages/languages/package.json | 12 +-- packages/markers/package.json | 12 +-- packages/merge-conflicts/package.json | 10 +-- packages/messages/package.json | 6 +- packages/metrics/package.json | 8 +- packages/mini-browser/package.json | 14 ++-- packages/monaco/package.json | 18 ++-- packages/navigator/package.json | 10 +-- packages/outline-view/package.json | 6 +- packages/output/package.json | 6 +- packages/plugin-ext-vscode/package.json | 6 +- packages/plugin-ext/package.json | 24 +++--- packages/plugin/package.json | 4 +- packages/preferences/package.json | 16 ++-- packages/preview/package.json | 12 +-- packages/process/package.json | 6 +- packages/python/package.json | 10 +-- packages/search-in-workspace/package.json | 16 ++-- packages/task/package.json | 16 ++-- packages/terminal/package.json | 12 +-- packages/textmate-grammars/package.json | 6 +- packages/tslint/package.json | 4 +- packages/typescript/package.json | 12 +-- packages/userstorage/package.json | 8 +- packages/variable-resolver/package.json | 6 +- packages/workspace/package.json | 10 +-- 50 files changed, 327 insertions(+), 319 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac00a8c80afbe..f1544d6a85449 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ## v0.3.16 - [plug-in] added `DocumentLinkProvider` Plug-in API - [plug-in] Terminal.sendText API adds a new line to the text being sent to the terminal if `addNewLine` parameter wasn't specified +- Reverted [cpp] Add debugging for C/C++ programs. This feature will come back in its own cpp-specific repo +- [core] Add methods to unregister menus, commands and keybindings +- [terminal] Add 'open in terminal' to navigator +- [markers] Added ability to remove markers +- [windows] Implemented drives selector for the file dialog +- [callhierarchy][typescript] adapt to hierarchical document symbols +- [output] Add button to clear output view +- [debug] decouple debug model from UI + clean up ## v0.3.15 diff --git a/dev-packages/application-manager/package.json b/dev-packages/application-manager/package.json index ac9e0f2a625eb..809582c09dfbf 100644 --- a/dev-packages/application-manager/package.json +++ b/dev-packages/application-manager/package.json @@ -1,6 +1,6 @@ { "name": "@theia/application-manager", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia application manager API.", "publishConfig": { "access": "public" @@ -29,7 +29,7 @@ "docs": "theiaext docs" }, "dependencies": { - "@theia/application-package": "^0.3.15", + "@theia/application-package": "^0.3.16", "@types/fs-extra": "^4.0.2", "bunyan": "^1.8.10", "circular-dependency-plugin": "^5.0.0", @@ -51,7 +51,7 @@ "worker-loader": "^1.1.1" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/dev-packages/application-package/package.json b/dev-packages/application-package/package.json index cfdd6290439be..d19bbcbbbe605 100644 --- a/dev-packages/application-package/package.json +++ b/dev-packages/application-package/package.json @@ -1,6 +1,6 @@ { "name": "@theia/application-package", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia application package API.", "publishConfig": { "access": "public" @@ -41,7 +41,7 @@ "write-json-file": "^2.2.0" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/dev-packages/cli/package.json b/dev-packages/cli/package.json index d7f3cf8406e52..9c4aec00af070 100644 --- a/dev-packages/cli/package.json +++ b/dev-packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@theia/cli", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia CLI.", "publishConfig": { "access": "public" @@ -31,6 +31,6 @@ "docs": "echo 'skip'" }, "dependencies": { - "@theia/application-manager": "^0.3.15" + "@theia/application-manager": "^0.3.16" } } diff --git a/dev-packages/ext-scripts/package.json b/dev-packages/ext-scripts/package.json index e8cf3fb89f442..9d16c2a58eb97 100644 --- a/dev-packages/ext-scripts/package.json +++ b/dev-packages/ext-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@theia/ext-scripts", - "version": "0.3.15", + "version": "0.3.16", "description": "NPM scripts for Theia packages.", "files": [ "theiaext" diff --git a/examples/browser/package.json b/examples/browser/package.json index 141e49633c52a..f1af12587a149 100644 --- a/examples/browser/package.json +++ b/examples/browser/package.json @@ -1,48 +1,48 @@ { "private": true, "name": "@theia/example-browser", - "version": "0.3.15", + "version": "0.3.16", "dependencies": { - "@theia/callhierarchy": "^0.3.15", - "@theia/console": "^0.3.15", - "@theia/core": "^0.3.15", - "@theia/cpp": "^0.3.15", - "@theia/debug": "^0.3.15", - "@theia/debug-nodejs": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/editorconfig": "^0.3.15", - "@theia/extension-manager": "^0.3.15", - "@theia/file-search": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/git": "^0.3.15", - "@theia/java": "^0.3.15", - "@theia/json": "^0.3.15", - "@theia/keymaps": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/markers": "^0.3.15", - "@theia/merge-conflicts": "^0.3.15", - "@theia/messages": "^0.3.15", - "@theia/metrics": "^0.3.15", - "@theia/mini-browser": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/outline-view": "^0.3.15", - "@theia/output": "^0.3.15", - "@theia/plugin-ext": "^0.3.15", - "@theia/plugin-ext-vscode": "^0.3.15", - "@theia/preferences": "^0.3.15", - "@theia/preview": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/python": "^0.3.15", - "@theia/search-in-workspace": "^0.3.15", - "@theia/task": "^0.3.15", - "@theia/terminal": "^0.3.15", - "@theia/textmate-grammars": "^0.3.15", - "@theia/tslint": "^0.3.15", - "@theia/typescript": "^0.3.15", - "@theia/userstorage": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", - "@theia/workspace": "^0.3.15" + "@theia/callhierarchy": "^0.3.16", + "@theia/console": "^0.3.16", + "@theia/core": "^0.3.16", + "@theia/cpp": "^0.3.16", + "@theia/debug": "^0.3.16", + "@theia/debug-nodejs": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/editorconfig": "^0.3.16", + "@theia/extension-manager": "^0.3.16", + "@theia/file-search": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/git": "^0.3.16", + "@theia/java": "^0.3.16", + "@theia/json": "^0.3.16", + "@theia/keymaps": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/markers": "^0.3.16", + "@theia/merge-conflicts": "^0.3.16", + "@theia/messages": "^0.3.16", + "@theia/metrics": "^0.3.16", + "@theia/mini-browser": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/outline-view": "^0.3.16", + "@theia/output": "^0.3.16", + "@theia/plugin-ext": "^0.3.16", + "@theia/plugin-ext-vscode": "^0.3.16", + "@theia/preferences": "^0.3.16", + "@theia/preview": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/python": "^0.3.16", + "@theia/search-in-workspace": "^0.3.16", + "@theia/task": "^0.3.16", + "@theia/terminal": "^0.3.16", + "@theia/textmate-grammars": "^0.3.16", + "@theia/tslint": "^0.3.16", + "@theia/typescript": "^0.3.16", + "@theia/userstorage": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", + "@theia/workspace": "^0.3.16" }, "scripts": { "prepare": "yarn run clean && yarn build", @@ -60,6 +60,6 @@ "coverage": "yarn coverage:compile && yarn test && yarn coverage:remap && yarn coverage:report:lcov && yarn coverage:report:html" }, "devDependencies": { - "@theia/cli": "^0.3.15" + "@theia/cli": "^0.3.16" } } diff --git a/examples/electron/package.json b/examples/electron/package.json index a5428e219bc34..f04d9e4ace12d 100644 --- a/examples/electron/package.json +++ b/examples/electron/package.json @@ -1,51 +1,51 @@ { "private": true, "name": "@theia/example-electron", - "version": "0.3.15", + "version": "0.3.16", "theia": { "target": "electron" }, "dependencies": { - "@theia/callhierarchy": "^0.3.15", - "@theia/console": "^0.3.15", - "@theia/core": "^0.3.15", - "@theia/cpp": "^0.3.15", - "@theia/debug": "^0.3.15", - "@theia/debug-nodejs": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/editorconfig": "^0.3.15", - "@theia/extension-manager": "^0.3.15", - "@theia/file-search": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/git": "^0.3.15", - "@theia/java": "^0.3.15", - "@theia/json": "^0.3.15", - "@theia/keymaps": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/markers": "^0.3.15", - "@theia/merge-conflicts": "^0.3.15", - "@theia/messages": "^0.3.15", - "@theia/metrics": "^0.3.15", - "@theia/mini-browser": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/outline-view": "^0.3.15", - "@theia/output": "^0.3.15", - "@theia/plugin-ext": "^0.3.15", - "@theia/plugin-ext-vscode": "^0.3.15", - "@theia/preferences": "^0.3.15", - "@theia/preview": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/python": "^0.3.15", - "@theia/search-in-workspace": "^0.3.15", - "@theia/task": "^0.3.15", - "@theia/terminal": "^0.3.15", - "@theia/textmate-grammars": "^0.3.15", - "@theia/tslint": "^0.3.15", - "@theia/typescript": "^0.3.15", - "@theia/userstorage": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", - "@theia/workspace": "^0.3.15" + "@theia/callhierarchy": "^0.3.16", + "@theia/console": "^0.3.16", + "@theia/core": "^0.3.16", + "@theia/cpp": "^0.3.16", + "@theia/debug": "^0.3.16", + "@theia/debug-nodejs": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/editorconfig": "^0.3.16", + "@theia/extension-manager": "^0.3.16", + "@theia/file-search": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/git": "^0.3.16", + "@theia/java": "^0.3.16", + "@theia/json": "^0.3.16", + "@theia/keymaps": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/markers": "^0.3.16", + "@theia/merge-conflicts": "^0.3.16", + "@theia/messages": "^0.3.16", + "@theia/metrics": "^0.3.16", + "@theia/mini-browser": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/outline-view": "^0.3.16", + "@theia/output": "^0.3.16", + "@theia/plugin-ext": "^0.3.16", + "@theia/plugin-ext-vscode": "^0.3.16", + "@theia/preferences": "^0.3.16", + "@theia/preview": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/python": "^0.3.16", + "@theia/search-in-workspace": "^0.3.16", + "@theia/task": "^0.3.16", + "@theia/terminal": "^0.3.16", + "@theia/textmate-grammars": "^0.3.16", + "@theia/tslint": "^0.3.16", + "@theia/typescript": "^0.3.16", + "@theia/userstorage": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", + "@theia/workspace": "^0.3.16" }, "scripts": { "prepare": "yarn run clean && yarn build", @@ -58,6 +58,6 @@ "test:ui": "wdio wdio.conf.js" }, "devDependencies": { - "@theia/cli": "^0.3.15" + "@theia/cli": "^0.3.16" } } diff --git a/lerna.json b/lerna.json index 6c1275205e950..6b39968442c9c 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "lerna": "2.2.0", "npmClient": "yarn", "useWorkspaces": true, - "version": "0.3.15", + "version": "0.3.16", "command": { "run": { "stream": true diff --git a/packages/bunyan/package.json b/packages/bunyan/package.json index 1cfb0bd1636b8..7630761eda53a 100644 --- a/packages/bunyan/package.json +++ b/packages/bunyan/package.json @@ -1,9 +1,9 @@ { "name": "@theia/bunyan", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - bunyan Logger Extension", "dependencies": { - "@theia/core": "^0.3.15", + "@theia/core": "^0.3.16", "@types/bunyan": "^1.8.0", "bunyan": "^1.8.10" }, @@ -40,7 +40,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/callhierarchy/package.json b/packages/callhierarchy/package.json index 9d90d74475701..3ccef39d0b66e 100644 --- a/packages/callhierarchy/package.json +++ b/packages/callhierarchy/package.json @@ -1,12 +1,12 @@ { "name": "@theia/callhierarchy", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Call Hierarchy Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16", "ts-md5": "^1.2.2" }, "publishConfig": { @@ -42,7 +42,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/console/package.json b/packages/console/package.json index d5e78134399c3..2435e5a91140d 100644 --- a/packages/console/package.json +++ b/packages/console/package.json @@ -1,9 +1,9 @@ { "name": "@theia/console", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Console Extension", "dependencies": { - "@theia/monaco": "^0.3.15", + "@theia/monaco": "^0.3.16", "anser": "^1.4.7" }, "publishConfig": { @@ -39,7 +39,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/core/package.json b/packages/core/package.json index d2867f795038a..70c3a55a44b13 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,12 +1,12 @@ { "name": "@theia/core", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.", "main": "lib/common/index.js", "typings": "lib/common/index.d.ts", "dependencies": { "@phosphor/widgets": "^1.5.0", - "@theia/application-package": "^0.3.15", + "@theia/application-package": "^0.3.16", "@types/body-parser": "^1.16.4", "@types/bunyan": "^1.8.0", "@types/express": "^4.16.0", @@ -81,7 +81,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/cpp/package.json b/packages/cpp/package.json index 4b3a9b3c3cdb4..8470d5916cca7 100644 --- a/packages/cpp/package.json +++ b/packages/cpp/package.json @@ -1,16 +1,16 @@ { "name": "@theia/cpp", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Cpp Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/preferences": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/task": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/preferences": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/task": "^0.3.16", "string-argv": "^0.1.1" }, "publishConfig": { @@ -48,7 +48,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/debug-nodejs/package.json b/packages/debug-nodejs/package.json index 8ff5ac33e13a0..a6c44c195a0e7 100644 --- a/packages/debug-nodejs/package.json +++ b/packages/debug-nodejs/package.json @@ -1,12 +1,12 @@ { "name": "@theia/debug-nodejs", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - NodeJS Debug Extension", "dependencies": { - "@theia/debug": "^0.3.15", + "@theia/debug": "^0.3.16", "ps-list": "5.0.1", - "vscode-debugprotocol": "^1.32.0", - "unzip-stream": "^0.3.0" + "unzip-stream": "^0.3.0", + "vscode-debugprotocol": "^1.32.0" }, "publishConfig": { "access": "public" @@ -44,7 +44,7 @@ "postinstall": "node ./scripts/download-vscode-node-debug.js" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/debug/package.json b/packages/debug/package.json index f3b6bcb5ae3d8..c56ac258b2d4c 100644 --- a/packages/debug/package.json +++ b/packages/debug/package.json @@ -1,18 +1,18 @@ { "name": "@theia/debug", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Debug Extension", "dependencies": { - "@theia/console": "^0.3.15", - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/markers": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/terminal": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/console": "^0.3.16", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/markers": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/terminal": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", + "@theia/workspace": "^0.3.16", "@types/p-debounce": "^1.0.0", "jsonc-parser": "^2.0.2", "p-debounce": "^1.0.0", @@ -52,7 +52,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/editor/package.json b/packages/editor/package.json index ed010c793c20f..c90bcc0db93ae 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,11 +1,11 @@ { "name": "@theia/editor", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Editor Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", "@types/base64-arraybuffer": "0.1.0", "base64-arraybuffer": "^0.1.5" }, @@ -42,7 +42,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/editorconfig/package.json b/packages/editorconfig/package.json index d9621878419d4..4af84e70e7cf3 100644 --- a/packages/editorconfig/package.json +++ b/packages/editorconfig/package.json @@ -1,11 +1,11 @@ { "name": "@theia/editorconfig", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Editorconfig Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/monaco": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/monaco": "^0.3.16", "editorconfig": "^0.15.0" }, "publishConfig": { @@ -42,7 +42,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/extension-manager/package.json b/packages/extension-manager/package.json index c74e9bbc9c5f9..8c9feee96640e 100644 --- a/packages/extension-manager/package.json +++ b/packages/extension-manager/package.json @@ -1,11 +1,11 @@ { "name": "@theia/extension-manager", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Extension Manager", "dependencies": { - "@theia/application-manager": "^0.3.15", - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", + "@theia/application-manager": "^0.3.16", + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", "@types/fs-extra": "^4.0.2", "@types/sanitize-html": "^1.13.31", "@types/showdown": "^1.7.1", @@ -47,7 +47,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/file-search/package.json b/packages/file-search/package.json index 75277af5192e0..e102113fd1aa9 100644 --- a/packages/file-search/package.json +++ b/packages/file-search/package.json @@ -1,12 +1,12 @@ { "name": "@theia/file-search", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - File Search Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/workspace": "^0.3.16", "fuzzy": "^0.1.3", "vscode-ripgrep": "^1.0.1" }, @@ -44,7 +44,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/filesystem/package.json b/packages/filesystem/package.json index bc198056bf3c1..410990b587dbe 100644 --- a/packages/filesystem/package.json +++ b/packages/filesystem/package.json @@ -1,9 +1,9 @@ { "name": "@theia/filesystem", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - FileSystem Extension", "dependencies": { - "@theia/core": "^0.3.15", + "@theia/core": "^0.3.16", "@types/base64-js": "^1.2.5", "@types/body-parser": "^1.17.0", "@types/fs-extra": "^4.0.2", @@ -69,7 +69,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/git/package.json b/packages/git/package.json index 1155932e8b43a..9056314569214 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -1,14 +1,14 @@ { "name": "@theia/git", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Git Integration", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/workspace": "^0.3.16", "@types/diff": "^3.2.2", "@types/fs-extra": "^4.0.2", "diff": "^3.4.0", @@ -54,7 +54,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15", + "@theia/ext-scripts": "^0.3.16", "upath": "^1.0.2" }, "nyc": { diff --git a/packages/java/package.json b/packages/java/package.json index 0d7708579efba..fc92c1a5b6717 100644 --- a/packages/java/package.json +++ b/packages/java/package.json @@ -1,12 +1,12 @@ { "name": "@theia/java", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Java Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16", "@types/glob": "^5.0.30", "@types/tar": "4.0.0", "glob": "^7.1.2", @@ -15,7 +15,7 @@ "tar": "^4.0.0" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "scripts": { "prepare": "yarn run clean && yarn run build", diff --git a/packages/json/package.json b/packages/json/package.json index ca6a72029eef9..7ff5cc159c8c3 100644 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -1,15 +1,15 @@ { "name": "@theia/json", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - JSON Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16", "vscode-json-languageserver": "^1.0.1" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "scripts": { "prepare": "yarn run clean && yarn run build", diff --git a/packages/keymaps/package.json b/packages/keymaps/package.json index 37f5d66af91bb..62f94fee9dacc 100644 --- a/packages/keymaps/package.json +++ b/packages/keymaps/package.json @@ -1,12 +1,12 @@ { "name": "@theia/keymaps", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Custom Keymaps Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/userstorage": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/userstorage": "^0.3.16", + "@theia/workspace": "^0.3.16", "@types/lodash.debounce": "4.0.3", "ajv": "^6.5.3", "fuzzy": "^0.1.3", @@ -14,7 +14,7 @@ "lodash.debounce": "^4.0.8" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15", + "@theia/ext-scripts": "^0.3.16", "@types/temp": "^0.8.29", "temp": "^0.8.3" }, diff --git a/packages/languages/package.json b/packages/languages/package.json index 8d839ff0622d4..fe1f47a6e6252 100644 --- a/packages/languages/package.json +++ b/packages/languages/package.json @@ -1,12 +1,12 @@ { "name": "@theia/languages", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Languages Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/output": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/output": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/workspace": "^0.3.16", "@typefox/monaco-editor-core": "^0.14.6", "@types/uuid": "^3.4.3", "monaco-languageclient": "^0.9.0", @@ -46,7 +46,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/markers/package.json b/packages/markers/package.json index 62b867deaf521..8e493936ee00f 100644 --- a/packages/markers/package.json +++ b/packages/markers/package.json @@ -1,12 +1,12 @@ { "name": "@theia/markers", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Markers Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/workspace": "^0.3.15" + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/workspace": "^0.3.16" }, "publishConfig": { "access": "public" @@ -41,7 +41,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/merge-conflicts/package.json b/packages/merge-conflicts/package.json index f3640dc179438..86f161e187593 100644 --- a/packages/merge-conflicts/package.json +++ b/packages/merge-conflicts/package.json @@ -1,11 +1,11 @@ { "name": "@theia/merge-conflicts", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Merge Conflicts Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/languages": "^0.3.15" + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/languages": "^0.3.16" }, "publishConfig": { "access": "public" @@ -40,7 +40,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/messages/package.json b/packages/messages/package.json index 626a9b2eb2142..5d20cf0aa1914 100644 --- a/packages/messages/package.json +++ b/packages/messages/package.json @@ -1,9 +1,9 @@ { "name": "@theia/messages", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Messages Extension", "dependencies": { - "@theia/core": "^0.3.15" + "@theia/core": "^0.3.16" }, "publishConfig": { "access": "public" @@ -39,7 +39,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 4990082ea1c7e..bd47cafcd4711 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -1,10 +1,10 @@ { "name": "@theia/metrics", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Metrics Extension", "dependencies": { - "@theia/application-manager": "^0.3.15", - "@theia/core": "^0.3.15", + "@theia/application-manager": "^0.3.16", + "@theia/core": "^0.3.16", "prom-client": "^10.2.0" }, "publishConfig": { @@ -40,7 +40,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/mini-browser/package.json b/packages/mini-browser/package.json index ce66d3d8b7aed..8385f32227e18 100644 --- a/packages/mini-browser/package.json +++ b/packages/mini-browser/package.json @@ -1,15 +1,15 @@ { "name": "@theia/mini-browser", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Mini-Browser Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@types/mime-types": "^2.1.0", + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", "@types/fs-extra": "^4.0.2", + "@types/mime-types": "^2.1.0", + "fs-extra": "^4.0.2", "mime-types": "^2.1.18", - "pdfobject": "^2.0.201604172", - "fs-extra": "^4.0.2" + "pdfobject": "^2.0.201604172" }, "publishConfig": { "access": "public" @@ -45,7 +45,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/monaco/package.json b/packages/monaco/package.json index 9f0eec2550727..1942e12ae0ddc 100644 --- a/packages/monaco/package.json +++ b/packages/monaco/package.json @@ -1,15 +1,15 @@ { "name": "@theia/monaco", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Monaco Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/markers": "^0.3.15", - "@theia/outline-view": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/markers": "^0.3.16", + "@theia/outline-view": "^0.3.16", + "@theia/workspace": "^0.3.16", "monaco-css": "^2.0.1", "monaco-html": "^2.0.2", "onigasm": "^2.1.0", @@ -50,7 +50,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/navigator/package.json b/packages/navigator/package.json index 2ccaf6987a68f..1597a4269e56a 100644 --- a/packages/navigator/package.json +++ b/packages/navigator/package.json @@ -1,11 +1,11 @@ { "name": "@theia/navigator", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Navigator Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/workspace": "^0.3.16", "fuzzy": "^0.1.3" }, "publishConfig": { @@ -41,7 +41,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/outline-view/package.json b/packages/outline-view/package.json index 645dc7e8f42f3..03dc74376c3ec 100644 --- a/packages/outline-view/package.json +++ b/packages/outline-view/package.json @@ -1,9 +1,9 @@ { "name": "@theia/outline-view", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Outline View Extension", "dependencies": { - "@theia/core": "^0.3.15" + "@theia/core": "^0.3.16" }, "publishConfig": { "access": "public" @@ -38,7 +38,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/output/package.json b/packages/output/package.json index a692ac3cf855f..1d624df0cec85 100644 --- a/packages/output/package.json +++ b/packages/output/package.json @@ -1,9 +1,9 @@ { "name": "@theia/output", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Output Extension", "dependencies": { - "@theia/core": "^0.3.15" + "@theia/core": "^0.3.16" }, "publishConfig": { "access": "public" @@ -38,7 +38,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/plugin-ext-vscode/package.json b/packages/plugin-ext-vscode/package.json index 12479d0236788..6fcedec480d06 100644 --- a/packages/plugin-ext-vscode/package.json +++ b/packages/plugin-ext-vscode/package.json @@ -1,9 +1,9 @@ { "name": "@theia/plugin-ext-vscode", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Plugin Extension for VsCode", "dependencies": { - "@theia/plugin-ext": "^0.3.15" + "@theia/plugin-ext": "^0.3.16" }, "publishConfig": { "access": "public" @@ -38,7 +38,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/plugin-ext/package.json b/packages/plugin-ext/package.json index 448f512313ef7..f6596b7b443dd 100644 --- a/packages/plugin-ext/package.json +++ b/packages/plugin-ext/package.json @@ -1,23 +1,23 @@ { "name": "@theia/plugin-ext", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Plugin Extension", "main": "lib/common/index.js", "typings": "lib/common/index.d.ts", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/plugin": "^0.3.15", - "@theia/workspace": "^0.3.15", - "@theia/debug-nodejs": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/debug-nodejs": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/plugin": "^0.3.16", + "@theia/workspace": "^0.3.16", "decompress": "^4.2.0", + "jsonc-parser": "^2.0.2", "lodash.clonedeep": "^4.5.0", "ps-tree": "1.1.0", - "vscode-uri": "^1.0.1", - "jsonc-parser": "^2.0.2" + "vscode-uri": "^1.0.1" }, "publishConfig": { "access": "public" @@ -54,7 +54,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15", + "@theia/ext-scripts": "^0.3.16", "@types/decompress": "^4.2.2", "@types/lodash.clonedeep": "^4.5.3" }, diff --git a/packages/plugin/package.json b/packages/plugin/package.json index e6c2908501259..77624912c472e 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@theia/plugin", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Plugin API", "types": "./src/theia.d.ts", "publishConfig": { @@ -27,7 +27,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/preferences/package.json b/packages/preferences/package.json index a0317e5a8901a..da041b9d20677 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -1,14 +1,14 @@ { "name": "@theia/preferences", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Preferences Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/monaco": "^0.3.15", - "@theia/userstorage": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/monaco": "^0.3.16", + "@theia/userstorage": "^0.3.16", + "@theia/workspace": "^0.3.16", "@types/fs-extra": "^4.0.2", "fs-extra": "^4.0.2", "jsonc-parser": "^2.0.2" @@ -46,7 +46,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/preview/package.json b/packages/preview/package.json index 81045430db14e..5bd363a61ffe3 100644 --- a/packages/preview/package.json +++ b/packages/preview/package.json @@ -1,12 +1,12 @@ { "name": "@theia/preview", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Preview Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/mini-browser": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/mini-browser": "^0.3.16", "@types/highlight.js": "^9.12.2", "@types/markdown-it": "^0.0.4", "@types/markdown-it-anchor": "^4.0.1", @@ -47,7 +47,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/process/package.json b/packages/process/package.json index 23bebbf2b009b..6dfee1e909af6 100644 --- a/packages/process/package.json +++ b/packages/process/package.json @@ -1,9 +1,9 @@ { "name": "@theia/process", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia process support.", "dependencies": { - "@theia/core": "^0.3.15", + "@theia/core": "^0.3.16", "node-pty": "0.7.6", "string-argv": "^0.1.1" }, @@ -40,7 +40,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/python/package.json b/packages/python/package.json index ce01d162c83c7..50e5f642d51e0 100644 --- a/packages/python/package.json +++ b/packages/python/package.json @@ -1,11 +1,11 @@ { "name": "@theia/python", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Python Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15" + "@theia/core": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16" }, "publishConfig": { "access": "public" @@ -42,7 +42,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/search-in-workspace/package.json b/packages/search-in-workspace/package.json index 4b2e0efb68443..2f8700a8b25a7 100644 --- a/packages/search-in-workspace/package.json +++ b/packages/search-in-workspace/package.json @@ -1,14 +1,14 @@ { "name": "@theia/search-in-workspace", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Search in workspace", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/editor": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/navigator": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/editor": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/navigator": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/workspace": "^0.3.16", "vscode-ripgrep": "^1.0.1" }, "publishConfig": { @@ -45,6 +45,6 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" } } diff --git a/packages/task/package.json b/packages/task/package.json index a42095e006952..6a0c57435ac8e 100644 --- a/packages/task/package.json +++ b/packages/task/package.json @@ -1,14 +1,14 @@ { "name": "@theia/task", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/markers": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/terminal": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/markers": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/terminal": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", + "@theia/workspace": "^0.3.16", "jsonc-parser": "^2.0.2" }, "publishConfig": { @@ -45,7 +45,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/terminal/package.json b/packages/terminal/package.json index ba88f47941fe9..596ae2cc68bf3 100644 --- a/packages/terminal/package.json +++ b/packages/terminal/package.json @@ -1,12 +1,12 @@ { "name": "@theia/terminal", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Terminal Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/process": "^0.3.15", - "@theia/workspace": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/process": "^0.3.16", + "@theia/workspace": "^0.3.16", "xterm": "~3.5.0" }, "publishConfig": { @@ -43,7 +43,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/textmate-grammars/package.json b/packages/textmate-grammars/package.json index 747827e09158f..d1ec8f71f568c 100644 --- a/packages/textmate-grammars/package.json +++ b/packages/textmate-grammars/package.json @@ -1,9 +1,9 @@ { "name": "@theia/textmate-grammars", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Textmate Grammars", "dependencies": { - "@theia/monaco": "^0.3.15" + "@theia/monaco": "^0.3.16" }, "publishConfig": { "access": "public" @@ -39,7 +39,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/tslint/package.json b/packages/tslint/package.json index 1447325d3e10e..0f2b97ff6d0b1 100644 --- a/packages/tslint/package.json +++ b/packages/tslint/package.json @@ -1,6 +1,6 @@ { "name": "@theia/tslint", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - TSLint Extension", "publishConfig": { "access": "public" @@ -34,7 +34,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 45111de21b1bb..99a2e174bfceb 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -1,12 +1,12 @@ { "name": "@theia/typescript", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Typescript Extension", "dependencies": { - "@theia/callhierarchy": "^0.3.15", - "@theia/core": "^0.3.15", - "@theia/languages": "^0.3.15", - "@theia/monaco": "^0.3.15", + "@theia/callhierarchy": "^0.3.16", + "@theia/core": "^0.3.16", + "@theia/languages": "^0.3.16", + "@theia/monaco": "^0.3.16", "typescript-language-server": "^0.3.5" }, "publishConfig": { @@ -44,7 +44,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/userstorage/package.json b/packages/userstorage/package.json index 016f5d9f018d7..5b22ac62e7d52 100644 --- a/packages/userstorage/package.json +++ b/packages/userstorage/package.json @@ -1,10 +1,10 @@ { "name": "@theia/userstorage", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - User Storage Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15" + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16" }, "publishConfig": { "access": "public" @@ -39,7 +39,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/variable-resolver/package.json b/packages/variable-resolver/package.json index d69da6d5124bd..ab7cfd610ded8 100644 --- a/packages/variable-resolver/package.json +++ b/packages/variable-resolver/package.json @@ -1,9 +1,9 @@ { "name": "@theia/variable-resolver", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Variable Resolver Extension", "dependencies": { - "@theia/core": "^0.3.15" + "@theia/core": "^0.3.16" }, "publishConfig": { "access": "public" @@ -44,7 +44,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 19477251cd09e..e283795cd3d21 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -1,11 +1,11 @@ { "name": "@theia/workspace", - "version": "0.3.15", + "version": "0.3.16", "description": "Theia - Workspace Extension", "dependencies": { - "@theia/core": "^0.3.15", - "@theia/filesystem": "^0.3.15", - "@theia/variable-resolver": "^0.3.15", + "@theia/core": "^0.3.16", + "@theia/filesystem": "^0.3.16", + "@theia/variable-resolver": "^0.3.16", "@types/fs-extra": "^4.0.2", "ajv": "^6.5.3", "fs-extra": "^4.0.2", @@ -47,7 +47,7 @@ "docs": "theiaext docs" }, "devDependencies": { - "@theia/ext-scripts": "^0.3.15" + "@theia/ext-scripts": "^0.3.16" }, "nyc": { "extends": "../../configs/nyc.json" From 81c8a93fc19c8b6d9d11c2dd6d02fb0ecfd96d9c Mon Sep 17 00:00:00 2001 From: Karthik Bhat Date: Thu, 25 Oct 2018 00:40:35 +0530 Subject: [PATCH 5/6] (#3273) Fix issues in Rename command 1) Disable rename option for workspace root. 2) Fix rename string displayed while renaming folders. Signed-off-by: Karthik Bhat --- .../workspace/src/browser/workspace-commands.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/workspace/src/browser/workspace-commands.ts b/packages/workspace/src/browser/workspace-commands.ts index 6a2686faaafe2..64175cceb8059 100644 --- a/packages/workspace/src/browser/workspace-commands.ts +++ b/packages/workspace/src/browser/workspace-commands.ts @@ -186,11 +186,18 @@ export class WorkspaceCommandContribution implements CommandContribution { }) })); registry.registerCommand(WorkspaceCommands.FILE_RENAME, this.newUriAwareCommandHandler({ - execute: uri => this.getParent(uri).then(parent => { + isVisible: uri => !this.isWorkspaceRoot(uri), + execute: uri => this.getParent(uri).then(async parent => { if (parent) { const initialValue = uri.path.base; + const stat = await this.fileSystem.getFileStat(uri.toString()); + if (stat === undefined) { + throw new Error(`Unexpected error occurred when renaming. File does not exist. URI: ${uri.toString(true)}.`); + } + const fileType = stat.isDirectory ? 'Directory' : 'File'; + const titleStr = `Rename ${fileType}`; const dialog = new SingleTextInputDialog({ - title: 'Rename File', + title: titleStr, initialValue, initialSelectionRange: { start: 0, @@ -376,6 +383,11 @@ export class WorkspaceCommandContribution implements CommandContribution { return uris.every(uri => rootUris.has(uri.toString())); } + protected isWorkspaceRoot(uri: URI): boolean { + const rootUris = new Set(this.workspaceService.tryGetRoots().map(root => root.uri)); + return rootUris.has(uri.toString()); + } + protected async removeFolderFromWorkspace(uris: URI[]): Promise { const roots = new Set(this.workspaceService.tryGetRoots().map(r => r.uri)); const toRemove = uris.filter(u => roots.has(u.toString())); From 3a13adaee5a03ff6f968d2f81bb8e102c6e7faa2 Mon Sep 17 00:00:00 2001 From: Vincent Fugnitto Date: Wed, 24 Oct 2018 14:43:34 -0400 Subject: [PATCH 6/6] Add missing Git History command to the command palette Fixes #3256 Signed-off-by: Vincent Fugnitto --- .../history/git-history-contribution.ts | 46 +++++++++++-------- .../history/git-history-frontend-module.ts | 4 +- .../browser/history/git-history-widget.tsx | 8 ++-- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/packages/git/src/browser/history/git-history-contribution.ts b/packages/git/src/browser/history/git-history-contribution.ts index e71a1b55a0e9c..e38b25b076218 100644 --- a/packages/git/src/browser/history/git-history-contribution.ts +++ b/packages/git/src/browser/history/git-history-contribution.ts @@ -15,7 +15,7 @@ ********************************************************************************/ import { MenuModelRegistry, CommandRegistry, Command, SelectionService } from '@theia/core'; -import { AbstractViewContribution } from '@theia/core/lib/browser'; +import { AbstractViewContribution, OpenViewArguments } from '@theia/core/lib/browser'; import { injectable, inject, postConstruct } from 'inversify'; import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-contribution'; import { UriCommandHandler, UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler'; @@ -26,18 +26,25 @@ import { GitRepositoryTracker } from '../git-repository-tracker'; import { GitRepositoryProvider } from '../git-repository-provider'; import { EDITOR_CONTEXT_MENU_GIT } from '../git-view-contribution'; +export const GIT_HISTORY_ID = 'git-history'; +export const GIT_HISTORY_LABEL = 'Git History'; +export const GIT_HISTORY_TOGGLE_KEYBINDING = 'alt+h'; +export const GIT_HISTORY_MAX_COUNT = 100; + export namespace GitHistoryCommands { export const OPEN_FILE_HISTORY: Command = { id: 'git-history:open-file-history', - label: 'Git History' }; export const OPEN_BRANCH_HISTORY: Command = { - id: 'git-history:open-branch-history' + id: 'git-history:open-branch-history', + label: GIT_HISTORY_LABEL }; } -export const GIT_HISTORY = 'git-history'; -export const GIT_HISTORY_MAX_COUNT = 100; +export interface GitHistoryOpenViewArguments extends OpenViewArguments { + uri: string | undefined; +} + @injectable() export class GitHistoryContribution extends AbstractViewContribution { @@ -50,14 +57,14 @@ export class GitHistoryContribution extends AbstractViewContribution): Promise { + const widget = await super.openView(args); + this.refreshWidget(args!.uri); + return widget; + } + registerMenus(menus: MenuModelRegistry): void { menus.registerMenuAction([...NAVIGATOR_CONTEXT_MENU, '5_history'], { - commandId: GitHistoryCommands.OPEN_FILE_HISTORY.id + commandId: GitHistoryCommands.OPEN_FILE_HISTORY.id, + label: GIT_HISTORY_LABEL }); menus.registerMenuAction(EDITOR_CONTEXT_MENU_GIT, { - commandId: GitHistoryCommands.OPEN_FILE_HISTORY.id + commandId: GitHistoryCommands.OPEN_FILE_HISTORY.id, + label: GIT_HISTORY_LABEL }); super.registerMenus(menus); } registerCommands(commands: CommandRegistry): void { commands.registerCommand(GitHistoryCommands.OPEN_FILE_HISTORY, this.newUriAwareCommandHandler({ - execute: async uri => this.showWidget(uri.toString()), + execute: async uri => this.openView({ activate: true, uri: uri.toString() }), isEnabled: (uri: URI) => !!this.repositoryProvider.findRepository(uri) })); commands.registerCommand(GitHistoryCommands.OPEN_BRANCH_HISTORY, { - execute: () => this.showWidget(undefined) - }); - } - - async showWidget(uri: string | undefined) { - await this.openView({ - activate: true + execute: () => this.openView({ activate: true, uri: undefined }) }); - this.refreshWidget(uri); } protected async refreshWidget(uri: string | undefined) { diff --git a/packages/git/src/browser/history/git-history-frontend-module.ts b/packages/git/src/browser/history/git-history-frontend-module.ts index b37a33c776dba..635e5087b9dee 100644 --- a/packages/git/src/browser/history/git-history-frontend-module.ts +++ b/packages/git/src/browser/history/git-history-frontend-module.ts @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { GitHistoryContribution, GIT_HISTORY } from './git-history-contribution'; +import { GitHistoryContribution, GIT_HISTORY_ID } from './git-history-contribution'; import { interfaces, Container } from 'inversify'; import { WidgetFactory, OpenHandler, bindViewContribution } from '@theia/core/lib/browser'; import { GitHistoryWidget } from './git-history-widget'; @@ -30,7 +30,7 @@ export function bindGitHistoryModule(bind: interfaces.Bind) { bind(GitAvatarService).toSelf().inSingletonScope(); bind(GitHistoryWidget).toSelf(); bind(WidgetFactory).toDynamicValue(ctx => ({ - id: GIT_HISTORY, + id: GIT_HISTORY_ID, createWidget: () => ctx.container.get(GitHistoryWidget) })); diff --git a/packages/git/src/browser/history/git-history-widget.tsx b/packages/git/src/browser/history/git-history-widget.tsx index 4219590bee4d6..5ff74a8acccc6 100644 --- a/packages/git/src/browser/history/git-history-widget.tsx +++ b/packages/git/src/browser/history/git-history-widget.tsx @@ -22,7 +22,7 @@ import { Message } from '@phosphor/messaging'; import { AutoSizer, List, ListRowRenderer, ListRowProps, InfiniteLoader, IndexRange, ScrollParams } from 'react-virtualized'; import { GIT_RESOURCE_SCHEME } from '../git-resource'; import URI from '@theia/core/lib/common/uri'; -import { GIT_HISTORY, GIT_HISTORY_MAX_COUNT } from './git-history-contribution'; +import { GIT_HISTORY_ID, GIT_HISTORY_MAX_COUNT, GIT_HISTORY_LABEL } from './git-history-contribution'; import { GitFileStatus, Git, GitFileChange, Repository } from '../../common'; import { FileSystem } from '@theia/filesystem/lib/common'; import { GitDiffContribution } from '../diff/git-diff-contribution'; @@ -69,10 +69,10 @@ export class GitHistoryWidget extends GitNavigableListWidget @inject(WidgetManager) protected readonly widgetManager: WidgetManager, @inject(GitDiffContribution) protected readonly diffContribution: GitDiffContribution) { super(); - this.id = GIT_HISTORY; + this.id = GIT_HISTORY_ID; this.scrollContainer = 'git-history-list-container'; - this.title.label = 'Git History'; - this.title.caption = 'Git History'; + this.title.label = GIT_HISTORY_LABEL; + this.title.caption = GIT_HISTORY_LABEL; this.title.iconClass = 'fa git-history-tab-icon'; this.addClass('theia-git'); this.resetState();