rework scm, recover git extension

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jun 12, 2019 · 8379164 · 8379164
1 parent b6c0d4b
commit 8379164
Show file tree

Hide file tree

Showing 53 changed files with 2,370 additions and 3,242 deletions.
diff --git a/packages/core/src/browser/context-menu-renderer.ts b/packages/core/src/browser/context-menu-renderer.ts
@@ -27,6 +27,7 @@ export function toAnchor(anchor: HTMLElement | { x: number, y: number }): Anchor
 export const ContextMenuRenderer = Symbol('ContextMenuRenderer');
 export interface ContextMenuRenderer {
     render(options: RenderContextMenuOptions): void;
+    /** @deprecated since 0.7.2 pass `RenderContextMenuOptions` instead */
     render(menuPath: MenuPath, anchor: Anchor, onHide?: () => void): void;
 }
 

diff --git a/packages/core/src/browser/resource-context-key.ts b/packages/core/src/browser/resource-context-key.ts
@@ -16,6 +16,7 @@
 
 import { injectable, inject, postConstruct } from 'inversify';
 import URI from '../common/uri';
+import Uri from 'vscode-uri';
 import { ContextKeyService, ContextKey } from './context-key-service';
 
 @injectable()
@@ -24,20 +25,28 @@ export class ResourceContextKey {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    protected resource: ContextKey<Uri>;
     protected resourceSchemeKey: ContextKey<string>;
     protected resourceFileName: ContextKey<string>;
     protected resourceExtname: ContextKey<string>;
     protected resourceLangId: ContextKey<string>;
 
     @postConstruct()
     protected init(): void {
+        this.resource = this.contextKeyService.createKey<Uri>('resource', undefined);
         this.resourceSchemeKey = this.contextKeyService.createKey<string>('resourceScheme', undefined);
         this.resourceFileName = this.contextKeyService.createKey<string>('resourceFilename', undefined);
         this.resourceExtname = this.contextKeyService.createKey<string>('resourceExtname', undefined);
         this.resourceLangId = this.contextKeyService.createKey<string>('resourceLangId', undefined);
     }
 
+    get(): URI | undefined {
+        const codeUri = this.resource.get();
+        return codeUri && new URI(codeUri);
+    }
+
     set(resourceUri: URI | undefined): void {
+        this.resource.set(resourceUri && resourceUri['codeUri']);
         this.resourceSchemeKey.set(resourceUri && resourceUri.scheme);
         this.resourceFileName.set(resourceUri && resourceUri.path.base);
         this.resourceExtname.set(resourceUri && resourceUri.path.ext);

diff --git a/packages/core/src/browser/shell/tab-bar-toolbar.tsx b/packages/core/src/browser/shell/tab-bar-toolbar.tsx
@@ -137,7 +137,7 @@ export class TabBarToolbar extends ReactWidget {
 
     protected renderMore(): React.ReactNode {
         return !!this.more.size && <div key='__more__' className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled'}>
-            <div id='__more__' className='fa fa-ellipsis-h' onClick={this.showMoreContextMenu} title='More...' />
+            <div id='__more__' className='fa fa-ellipsis-h' onClick={this.showMoreContextMenu} title='More Actions...' />
         </div>;
     }
 

diff --git a/packages/core/src/browser/status-bar/status-bar.tsx b/packages/core/src/browser/status-bar/status-bar.tsx
@@ -24,7 +24,7 @@ import { LabelParser, LabelIcon } from '../label-parser';
 
 export interface StatusBarEntry {
     /**
-     * For icons we use fontawesome. Get more information and the class names
+     * For icons we use octicons and fontawesome icons. octicons take precedence over fontawesome. Get more information and the class names
      * here: http://fontawesome.io/icons/
      * To set a text with icon use the following pattern in text string:
      * $(fontawesomeClassName)

diff --git a/packages/git/src/browser/dirty-diff/content-lines.ts b/packages/git/src/browser/dirty-diff/content-lines.ts
diff --git a/packages/git/src/browser/dirty-diff/diff-computer.ts b/packages/git/src/browser/dirty-diff/diff-computer.ts
diff --git a/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts b/packages/git/src/browser/dirty-diff/dirty-diff-contribution.ts
@@ -15,9 +15,9 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
+import { DirtyDiffDecorator } from '@theia/scm/lib/browser/dirty-diff/dirty-diff-decorator';
 import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser';
 import { DirtyDiffManager } from './dirty-diff-manager';
-import { DirtyDiffDecorator } from './dirty-diff-decorator';
 
 @injectable()
 export class DirtyDiffContribution implements FrontendApplicationContribution {

diff --git a/packages/git/src/browser/dirty-diff/dirty-diff-decorator.ts b/packages/git/src/browser/dirty-diff/dirty-diff-decorator.ts