merge with master

.travis.yml

@@ -51,6 +51,7 @@ cache:
     - packages/search-in-workspace/node_modules
     - packages/task/node_modules
     - packages/terminal/node_modules
+    - packages/timeline/node_modules
     - packages/typehierarchy/node_modules
     - packages/userstorage/node_modules
     - packages/variable-resolver/node_modules

configs/root-compilation.tsconfig.json

@@ -132,6 +132,9 @@
     },
     {
       "path": "../packages/vsx-registry/compile.tsconfig.json"
+    },
+    {
+      "path": "../packages/timeline/compile.tsconfig.json"
     }
   ]
 }

examples/browser/package.json

@@ -46,6 +46,7 @@
     "@theia/search-in-workspace": "^1.5.0",
     "@theia/task": "^1.5.0",
     "@theia/terminal": "^1.5.0",
+    "@theia/timeline": "^1.5.0",
     "@theia/typehierarchy": "^1.5.0",
     "@theia/userstorage": "^1.5.0",
     "@theia/variable-resolver": "^1.5.0",

examples/electron/compile.tsconfig.json

@@ -118,6 +118,9 @@
     },
     {
       "path": "../../packages/vsx-registry/compile.tsconfig.json"
+    },
+    {
+      "path": "../../packages/timeline/compile.tsconfig.json"
     }
   ]
 }

examples/electron/package.json

@@ -46,6 +46,7 @@
     "@theia/search-in-workspace": "^1.5.0",
     "@theia/task": "^1.5.0",
     "@theia/terminal": "^1.5.0",
+    "@theia/timeline": "^1.5.0",
     "@theia/typehierarchy": "^1.5.0",
     "@theia/userstorage": "^1.5.0",
     "@theia/variable-resolver": "^1.5.0",

packages/core/src/browser/keybinding.ts

@@ -184,7 +184,7 @@ export class KeybindingRegistry {
     }
 
     /**
-     * Unregister keybindings from the registry using the key of the given keybinging
+     * Unregister keybindings from the registry using the key of the given keybinding
      *
      * @param binding a Keybinding specifying the key to be unregistered
      */

packages/core/src/common/encoding-service.ts

@@ -123,7 +123,7 @@ export class EncodingService {
     async detectEncoding(data: BinaryBuffer, autoGuessEncoding?: boolean): Promise<DetectedEncoding> {
         const buffer = Buffer.from(data.buffer);
         const bytesRead = data.byteLength;
-        // Always first check for BOM to find out abouÏt encoding
+        // Always first check for BOM to find out about encoding
         let encoding = this.detectEncodingByBOMFromBuffer(buffer, bytesRead);
 
         // Detect 0 bytes to see if file is binary or UTF-16 LE/BEÏ

packages/filesystem/src/browser/file-service.ts

@@ -762,7 +762,7 @@ export class FileService {
      * that only the mtime is an indicator for a file that has changed on disk.
      *
      * Second, if the mtime has advanced, we compare the size of the file on disk with our previous
-     * one using the etag() function. Relying only on the mtime check has prooven to produce false
+     * one using the etag() function. Relying only on the mtime check has proven to produce false
      * positives due to file system weirdness (especially around remote file systems). As such, the
      * check for size is a weaker check because it can return a false negative if the file has changed
      * but to the same length. This is a compromise we take to avoid having to produce checksums of
@@ -1019,7 +1019,7 @@ export class FileService {
         // validation
         const { exists, isSameResourceWithDifferentPathCase } = await this.doValidateMoveCopy(sourceProvider, source, targetProvider, target, mode, overwrite);
 
-        // delete as needed (unless target is same resurce with different path case)
+        // delete as needed (unless target is same resource with different path case)
         if (exists && !isSameResourceWithDifferentPathCase && overwrite) {
             await this.delete(target, { recursive: true });
         }

packages/filesystem/src/browser/filesystem-watcher.ts

@@ -48,7 +48,7 @@ export namespace FileChange {
 }
 
 /**
- * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileChangesEvent` instead
+ * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileChangesEvent` instead
  */
 export type FileChangeEvent = FileChange[];
 export namespace FileChangeEvent {
@@ -70,7 +70,7 @@ export namespace FileChangeEvent {
 }
 
 /**
- * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `UserFileOperationEvent` instead
+ * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `UserFileOperationEvent` instead
  */
 export interface FileMoveEvent extends WaitUntilEvent {
     sourceUri: URI
@@ -83,7 +83,7 @@ export namespace FileMoveEvent {
 }
 
 /**
- * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `UserFileOperationEvent` instead
+ * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `UserFileOperationEvent` instead
  */
 export interface FileEvent extends WaitUntilEvent {
     uri: URI
@@ -129,7 +129,7 @@ export class FileOperationEmitter<E extends WaitUntilEvent> implements Disposabl
  * `on(will|did)(create|rename|delete)` events solely come from application
  * usage, not from actual filesystem.
  *
- * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.watch` instead
+ * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.watch` instead
  */
 @injectable()
 export class FileSystemWatcher implements Disposable {
@@ -139,54 +139,54 @@ export class FileSystemWatcher implements Disposable {
 
     protected readonly onFileChangedEmitter = new Emitter<FileChangeEvent>();
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFilesChange` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFilesChange` instead
      */
     readonly onFilesChanged = this.onFileChangedEmitter.event;
 
     protected readonly fileCreateEmitter = new FileOperationEmitter<FileEvent>();
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
      */
     readonly onWillCreate = this.fileCreateEmitter.onWill;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
      */
     readonly onDidFailCreate = this.fileCreateEmitter.onDidFail;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
-     * insead use `FileService.onDidRunUserOperation` for events triggered by user gestures
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
+     * instead use `FileService.onDidRunUserOperation` for events triggered by user gestures
      * or `FileService.onDidRunOperation` triggered by user gestures and programmatically
      */
     readonly onDidCreate = this.fileCreateEmitter.onDid;
 
     protected readonly fileDeleteEmitter = new FileOperationEmitter<FileEvent>();
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
      */
     readonly onWillDelete = this.fileDeleteEmitter.onWill;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
      */
     readonly onDidFailDelete = this.fileDeleteEmitter.onDidFail;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
-     * insead use `FileService.onDidRunUserOperation` for events triggered by user gestures
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
+     * instead use `FileService.onDidRunUserOperation` for events triggered by user gestures
      * or `FileService.onDidRunOperation` triggered by user gestures and programmatically
      */
     readonly onDidDelete = this.fileDeleteEmitter.onDid;
 
     protected readonly fileMoveEmitter = new FileOperationEmitter<FileMoveEvent>();
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onWillRunUserOperation` instead
      */
     readonly onWillMove = this.fileMoveEmitter.onWill;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908), use `FileService.onDidFailUserOperation` instead
      */
     readonly onDidFailMove = this.fileMoveEmitter.onDidFail;
     /**
-     * @deprecated since 1.4.0 - in order to suppot VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
-     * insead use `FileService.onDidRunUserOperation` for events triggered by user gestures
+     * @deprecated since 1.4.0 - in order to support VS Code FS API (https://github.com/eclipse-theia/theia/pull/7908),
+     * instead use `FileService.onDidRunUserOperation` for events triggered by user gestures
      * or `FileService.onDidRunOperation` triggered by user gestures and programmatically
      */
     readonly onDidMove = this.fileMoveEmitter.onDid;

packages/filesystem/src/common/delegating-file-system-provider.ts

@@ -186,7 +186,7 @@ export class DelegatingFileSystemProvider implements Required<FileSystemProvider
     /**
      * Converts from an underlying fs provider resource format.
      *
-     * For example converting `file` resources unser a user home to `user-storage` resource:
+     * For example converting `file` resources under a user home to `user-storage` resource:
      * - file://home/.theia/settings.json => user-storage:/user/settings.json
      * - file://documents/some-document.txt => undefined
      */
@@ -212,7 +212,7 @@ export namespace DelegatingFileSystemProvider {
         /**
          * Converts from an underlying fs provider resource format.
          *
-         * For example converting `file` resources unser a user home to `user-storage` resource:
+         * For example converting `file` resources under a user home to `user-storage` resource:
          * - file://home/.theia/settings.json => user-storage:/settings.json
          * - file://documents/some-document.txt => undefined
          */