Use filesystem specific path for search path

Signed-off-by: William Gonzalez <William.Gonzalez@arm.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+<!-- Please provide a clear and meaningful description to the CHANGELOG.md file if this PR contributes some significant changes -->

README.md

@@ -1,4 +1,5 @@
 # Theia - Cloud & Desktop IDE
+[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/theia-ide/theia)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/theia-ide/theia/labels/help%20wanted)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/theia-ide/theia)
 [![Build Status](https://travis-ci.org/theia-ide/theia.svg?branch=master)](https://travis-ci.org/theia-ide/theia)
@@ -31,9 +32,11 @@ Theia is an extensible platform to develop full-fledged multi-language Cloud & D
 
 ## Getting Started
 Here you can find guides and examples for common scenarios:
-- [Develop a new Theia extension](http://www.theia-ide.org/doc/Authoring_Extensions.html)
-- Develop a new Theia application for [Cloud](examples/browser/package.json) or [Desktop](examples/electron/package.json) with [Theia CLI](dev-packages/cli/README.md)
-- [Run Theia IDE for Web Developers with Docker](https://github.com/theia-ide/theia-apps#theia-docker)
+- [Run Theia in Docker](https://github.com/theia-ide/theia-apps#theia-docker)
+- [Run Theia in Gitpod - a Theia-based IDE for GitHub](doc/Developing.md#run-the-browser-example-with-gitpod)
+- [Develop a Theia application - your own IDE](https://www.theia-ide.org/doc/Composing_Applications.html)
+- [Develop a Theia plugin - a VS Code like extension](https://www.theia-ide.org/doc/Authoring_Plugins.html)
+- [Develop a Theia extension](http://www.theia-ide.org/doc/Authoring_Extensions.html)
 - [Package a desktop Theia application with Electron](https://github.com/theia-ide/yangster-electron)
 
 ## Contributing

dev-packages/application-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/application-manager",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Theia application manager API.",
   "publishConfig": {
     "access": "public"
@@ -29,7 +29,7 @@
     "docs": "theiaext docs"
   },
   "dependencies": {
-    "@theia/application-package": "^0.3.13",
+    "@theia/application-package": "^0.3.14",
     "bunyan": "^1.8.10",
     "circular-dependency-plugin": "^5.0.0",
     "copy-webpack-plugin": "^4.5.0",
@@ -49,7 +49,7 @@
     "worker-loader": "^1.1.1"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "^0.3.13"
+    "@theia/ext-scripts": "^0.3.14"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"

dev-packages/application-manager/src/generator/webpack-generator.ts

@@ -47,7 +47,7 @@ const { mode }  = yargs.option('mode', {
 }).argv;
 const development = mode === 'development';${this.ifMonaco(() => `
 
-const monacoEditorCorePath = development ? '${this.resolve('monaco-editor-core', 'dev/vs')}' : '${this.resolve('monaco-editor-core', 'min/vs')}';
+const monacoEditorCorePath = development ? '${this.resolve('@typefox/monaco-editor-core', 'dev/vs')}' : '${this.resolve('@typefox/monaco-editor-core', 'min/vs')}';
 const monacoCssLanguagePath = '${this.resolve('monaco-css', 'release/min')}';
 const monacoHtmlLanguagePath = '${this.resolve('monaco-html', 'release/min')}';`)}
 

dev-packages/application-package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/application-package",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Theia application package API.",
   "publishConfig": {
     "access": "public"
@@ -40,7 +40,7 @@
     "write-json-file": "^2.2.0"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "^0.3.13"
+    "@theia/ext-scripts": "^0.3.14"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"

dev-packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/cli",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Theia CLI.",
   "publishConfig": {
     "access": "public"
@@ -31,6 +31,6 @@
     "docs": "echo 'skip'"
   },
   "dependencies": {
-    "@theia/application-manager": "^0.3.13"
+    "@theia/application-manager": "^0.3.14"
   }
 }

dev-packages/ext-scripts/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@theia/ext-scripts",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "NPM scripts for Theia packages.",
   "files": [
     "theiaext"

doc/Developing.md

@@ -14,6 +14,7 @@ For Windows instructions [click here](#building-on-windows).
  - [**Prerequisites**](#prerequisites)
  - [**Quick Start**](#quick-start)
     - [Run with SSL](#run-the-browser-example-with-ssl)
+    - [Run with Gitpod](#run-the-browser-example-with-gitpod)
  - [**Clone the repository**](#clone-the-repository)
  - [**The repository structure**](#the-repository-structure)
  - [**Build core, extensions and examples packages**](#build-core-extensions-and-examples-packages)
@@ -83,6 +84,17 @@ To run the browser example using SSL use:
 
 Start your browser on https://localhost:3000.
 
+### Run the browser example with Gitpod
+
+[Gitpod](http://gitpod.io/) is a Theia-based IDE for GitHub.
+You can start by prefixing any GitHub URL in the Theia repository with `gitpod.io#`:
+- Open http://gitpod.io#https://github.com/theia-ide/theia to start development with the master branch.
+- Gitpod will start a properly configured for Theia development workspace, clone and build the Theia repository.
+- After the build is finished, run from the terminal in Gitpod:
+
+        cd examples/browser \
+        && yarn run start ../.. --hostname 0.0.0.0
+
 ## Clone the repository
 
     git clone https://github.com/theia-ide/theia

examples/browser/package.json

@@ -1,45 +1,46 @@
 {
   "private": true,
   "name": "@theia/example-browser",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "dependencies": {
-    "@theia/callhierarchy": "^0.3.13",
-    "@theia/core": "^0.3.13",
-    "@theia/cpp": "^0.3.13",
-    "@theia/debug": "^0.3.13",
-    "@theia/debug-nodejs": "^0.3.13",
-    "@theia/editor": "^0.3.13",
-    "@theia/editorconfig": "^0.3.13",
-    "@theia/extension-manager": "^0.3.13",
-    "@theia/file-search": "^0.3.13",
-    "@theia/filesystem": "^0.3.13",
-    "@theia/git": "^0.3.13",
-    "@theia/java": "^0.3.13",
-    "@theia/keymaps": "^0.3.13",
-    "@theia/languages": "^0.3.13",
-    "@theia/markers": "^0.3.13",
-    "@theia/merge-conflicts": "^0.3.13",
-    "@theia/messages": "^0.3.13",
-    "@theia/metrics": "^0.3.13",
-    "@theia/mini-browser": "^0.3.13",
-    "@theia/monaco": "^0.3.13",
-    "@theia/navigator": "^0.3.13",
-    "@theia/outline-view": "^0.3.13",
-    "@theia/output": "^0.3.13",
-    "@theia/plugin-ext": "^0.3.13",
-    "@theia/plugin-ext-vscode": "^0.3.13",
-    "@theia/preferences": "^0.3.13",
-    "@theia/preview": "^0.3.13",
-    "@theia/process": "^0.3.13",
-    "@theia/python": "^0.3.13",
-    "@theia/search-in-workspace": "^0.3.13",
-    "@theia/task": "^0.3.13",
-    "@theia/terminal": "^0.3.13",
-    "@theia/textmate-grammars": "^0.3.13",
-    "@theia/typescript": "^0.3.13",
-    "@theia/userstorage": "^0.3.13",
-    "@theia/variable-resolver": "^0.3.13",
-    "@theia/workspace": "^0.3.13"
+    "@theia/callhierarchy": "^0.3.14",
+    "@theia/core": "^0.3.14",
+    "@theia/cpp": "^0.3.14",
+    "@theia/debug": "^0.3.14",
+    "@theia/debug-nodejs": "^0.3.14",
+    "@theia/editor": "^0.3.14",
+    "@theia/editorconfig": "^0.3.14",
+    "@theia/extension-manager": "^0.3.14",
+    "@theia/file-search": "^0.3.14",
+    "@theia/filesystem": "^0.3.14",
+    "@theia/git": "^0.3.14",
+    "@theia/java": "^0.3.14",
+    "@theia/json": "^0.3.14",
+    "@theia/keymaps": "^0.3.14",
+    "@theia/languages": "^0.3.14",
+    "@theia/markers": "^0.3.14",
+    "@theia/merge-conflicts": "^0.3.14",
+    "@theia/messages": "^0.3.14",
+    "@theia/metrics": "^0.3.14",
+    "@theia/mini-browser": "^0.3.14",
+    "@theia/monaco": "^0.3.14",
+    "@theia/navigator": "^0.3.14",
+    "@theia/outline-view": "^0.3.14",
+    "@theia/output": "^0.3.14",
+    "@theia/plugin-ext": "^0.3.14",
+    "@theia/plugin-ext-vscode": "^0.3.14",
+    "@theia/preferences": "^0.3.14",
+    "@theia/preview": "^0.3.14",
+    "@theia/process": "^0.3.14",
+    "@theia/python": "^0.3.14",
+    "@theia/search-in-workspace": "^0.3.14",
+    "@theia/task": "^0.3.14",
+    "@theia/terminal": "^0.3.14",
+    "@theia/textmate-grammars": "^0.3.14",
+    "@theia/typescript": "^0.3.14",
+    "@theia/userstorage": "^0.3.14",
+    "@theia/variable-resolver": "^0.3.14",
+    "@theia/workspace": "^0.3.14"
   },
   "scripts": {
     "prepare": "yarn run clean && yarn build",
@@ -56,6 +57,6 @@
     "coverage": "yarn coverage:compile && yarn test && yarn coverage:remap && yarn coverage:report:lcov && yarn coverage:report:html"
   },
   "devDependencies": {
-    "@theia/cli": "^0.3.13"
+    "@theia/cli": "^0.3.14"
   }
-}
+}

examples/browser/test/top-panel/top-panel.ui-spec.ts

@@ -245,8 +245,8 @@ describe('theia top panel (menubar)', () => {
     });
 
     describe('search view UI', () => {
-        it('should start with search view not visible', () => {
-            expect(leftPanel.isSearchViewVisible()).to.be.false;
+        it('should start with search view visible', () => {
+            expect(leftPanel.isSearchViewVisible()).to.be.true;
         });
         it('search view should toggle-on then toggle-off', () => {
             if (!leftPanel.isSearchViewVisible()) {

examples/browser/wdio.conf.js

@@ -2,10 +2,27 @@
 const http = require('http');
 const path = require('path');
 
-const port = 3000;
-const host = 'localhost';
+const wdioRunnerScript = require.resolve('webdriverio/build/lib/runner.js');
+
+/**
+ * WebdriverIO will execute this current script first to setup the tests,
+ *  and it will re-execute it for every test workers (subprocesses).
+ * This means that if we are to set a random port for Theia's backend in the master process,
+ *  we have to pass the port value to the child processes.
+ * This is done via command line arguments: the following lines fetch the port passed
+ *  to the script, it should be set by the master process for the children,
+ *  but you can also specify it manually by doing `yarn test --theia-port 4000` from
+ *  `examples/browser`.
+ */
+const cliPortKey = '--theia-port';
+const cliPortIndex = process.argv.indexOf(cliPortKey);
+const masterPort = cliPortIndex > -1 ? process.argv[cliPortIndex + 1] : 0; // 0 if master
+if (typeof masterPort === 'undefined') {
+    throw new Error(`${cliPortKey} expects a number as following argument`);
+}
 
-let server;
+const port = masterPort;
+const host = 'localhost';
 
 exports.config = {
 
@@ -167,15 +184,16 @@ exports.config = {
     //
     // Gets executed once before all workers get launched.
     onPrepare: function (config, capabilities) {
-        return require('./src-gen/backend/server')(port, host).then(s => {
-            server = s;
+        return require('./src-gen/backend/server')(port, host).then(created => {
+            this.execArgv = [wdioRunnerScript, cliPortKey, created.address().port];
+            this.server = created;
         });
     },
     // Gets executed after all workers got shut down and the process is about to exit. It is not
     // possible to defer the end of the process using a promise.
     onComplete: function (exitCode) {
-        if (server) {
-            server.close();
+        if (this.server) {
+            this.server.close();
         }
     },
     //

examples/electron/package.json

@@ -1,48 +1,49 @@
 {
   "private": true,
   "name": "@theia/example-electron",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "theia": {
     "target": "electron"
   },
   "dependencies": {
-    "@theia/callhierarchy": "^0.3.13",
-    "@theia/core": "^0.3.13",
-    "@theia/cpp": "^0.3.13",
-    "@theia/debug": "^0.3.13",
-    "@theia/debug-nodejs": "^0.3.13",
-    "@theia/editor": "^0.3.13",
-    "@theia/editorconfig": "^0.3.13",
-    "@theia/extension-manager": "^0.3.13",
-    "@theia/file-search": "^0.3.13",
-    "@theia/filesystem": "^0.3.13",
-    "@theia/git": "^0.3.13",
-    "@theia/java": "^0.3.13",
-    "@theia/keymaps": "^0.3.13",
-    "@theia/languages": "^0.3.13",
-    "@theia/markers": "^0.3.13",
-    "@theia/merge-conflicts": "^0.3.13",
-    "@theia/messages": "^0.3.13",
-    "@theia/metrics": "^0.3.13",
-    "@theia/mini-browser": "^0.3.13",
-    "@theia/monaco": "^0.3.13",
-    "@theia/navigator": "^0.3.13",
-    "@theia/outline-view": "^0.3.13",
-    "@theia/output": "^0.3.13",
-    "@theia/plugin-ext": "^0.3.13",
-    "@theia/plugin-ext-vscode": "^0.3.13",
-    "@theia/preferences": "^0.3.13",
-    "@theia/preview": "^0.3.13",
-    "@theia/process": "^0.3.13",
-    "@theia/python": "^0.3.13",
-    "@theia/search-in-workspace": "^0.3.13",
-    "@theia/task": "^0.3.13",
-    "@theia/terminal": "^0.3.13",
-    "@theia/textmate-grammars": "^0.3.13",
-    "@theia/typescript": "^0.3.13",
-    "@theia/userstorage": "^0.3.13",
-    "@theia/variable-resolver": "^0.3.13",
-    "@theia/workspace": "^0.3.13"
+    "@theia/callhierarchy": "^0.3.14",
+    "@theia/core": "^0.3.14",
+    "@theia/cpp": "^0.3.14",
+    "@theia/debug": "^0.3.14",
+    "@theia/debug-nodejs": "^0.3.14",
+    "@theia/editor": "^0.3.14",
+    "@theia/editorconfig": "^0.3.14",
+    "@theia/extension-manager": "^0.3.14",
+    "@theia/file-search": "^0.3.14",
+    "@theia/filesystem": "^0.3.14",
+    "@theia/git": "^0.3.14",
+    "@theia/java": "^0.3.14",
+    "@theia/json": "^0.3.14",
+    "@theia/keymaps": "^0.3.14",
+    "@theia/languages": "^0.3.14",
+    "@theia/markers": "^0.3.14",
+    "@theia/merge-conflicts": "^0.3.14",
+    "@theia/messages": "^0.3.14",
+    "@theia/metrics": "^0.3.14",
+    "@theia/mini-browser": "^0.3.14",
+    "@theia/monaco": "^0.3.14",
+    "@theia/navigator": "^0.3.14",
+    "@theia/outline-view": "^0.3.14",
+    "@theia/output": "^0.3.14",
+    "@theia/plugin-ext": "^0.3.14",
+    "@theia/plugin-ext-vscode": "^0.3.14",
+    "@theia/preferences": "^0.3.14",
+    "@theia/preview": "^0.3.14",
+    "@theia/process": "^0.3.14",
+    "@theia/python": "^0.3.14",
+    "@theia/search-in-workspace": "^0.3.14",
+    "@theia/task": "^0.3.14",
+    "@theia/terminal": "^0.3.14",
+    "@theia/textmate-grammars": "^0.3.14",
+    "@theia/typescript": "^0.3.14",
+    "@theia/userstorage": "^0.3.14",
+    "@theia/variable-resolver": "^0.3.14",
+    "@theia/workspace": "^0.3.14"
   },
   "scripts": {
     "prepare": "yarn run clean && yarn build",
@@ -55,6 +56,6 @@
     "test:ui": "wdio wdio.conf.js"
   },
   "devDependencies": {
-    "@theia/cli": "^0.3.13"
+    "@theia/cli": "^0.3.14"
   }
-}
+}

lerna.json

@@ -2,7 +2,7 @@
   "lerna": "2.2.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.3.13",
+  "version": "0.3.14",
   "command": {
     "run": {
       "stream": true

package.json

@@ -41,7 +41,6 @@
     "typescript": "^2.7.2",
     "uuid": "^3.1.0",
     "wdio-mocha-framework": "0.5.9",
-    "wdio-phantomjs-service": "0.2.2",
     "wdio-selenium-standalone-service": "0.0.8",
     "wdio-spec-reporter": "0.1.0",
     "webdriverio": "4.9.2"