-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed the `git diff` parser issue. Toggle Widget with alt+h or via view menu The list gets lazy loaded Signed-off-by: Jan Bicker <jan.bicker@typefox.io>
- Loading branch information
Showing
15 changed files
with
897 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
packages/git/src/browser/history/git-history-commit-uri.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Copyright (C) 2018 TypeFox and others. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
|
|
||
| import URI from "@theia/core/lib/common/uri"; | ||
|
|
||
| export namespace GitDiffCommitUri { | ||
| export const scheme = 'git-diff-commit'; | ||
| export function toUri(commitName: string): URI { | ||
| return new URI('').withScheme(scheme).withFragment(commitName); | ||
| } | ||
| export function toCommitName(uri: URI): string { | ||
| if (uri.scheme === scheme) { | ||
| return uri.fragment; | ||
| } | ||
| throw new Error('The given uri is not an commit URI, uri: ' + uri); | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
packages/git/src/browser/history/git-history-contribution.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright (C) 2018 TypeFox and others. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
|
|
||
| import { MenuModelRegistry, CommandRegistry, Command, SelectionService } from "@theia/core"; | ||
| import { AbstractViewContribution } from "@theia/core/lib/browser"; | ||
| import { injectable, inject } from "inversify"; | ||
| import { NAVIGATOR_CONTEXT_MENU } from "@theia/navigator/lib/browser/navigator-menu"; | ||
| import { UriCommandHandler, FileSystemCommandHandler } from "@theia/workspace/lib/browser/workspace-commands"; | ||
| import { GitHistoryWidget } from './git-history-widget'; | ||
| import { Git } from "../../common"; | ||
|
|
||
| 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' | ||
| }; | ||
| } | ||
|
|
||
| export const GIT_HISTORY = 'git-history'; | ||
| export const GIT_HISTORY_MAX_COUNT = 100; | ||
| @injectable() | ||
| export class GitHistoryContribution extends AbstractViewContribution<GitHistoryWidget> { | ||
|
|
||
| constructor( | ||
| @inject(SelectionService) protected readonly selectionService: SelectionService) { | ||
| super({ | ||
| widgetId: GIT_HISTORY, | ||
| widgetName: 'Git History', | ||
| defaultWidgetOptions: { | ||
| area: 'left', | ||
| rank: 400 | ||
| }, | ||
| toggleCommandId: GitHistoryCommands.OPEN_BRANCH_HISTORY.id, | ||
| toggleKeybinding: 'alt+h' | ||
| }); | ||
| } | ||
|
|
||
| registerMenus(menus: MenuModelRegistry): void { | ||
| menus.registerMenuAction([...NAVIGATOR_CONTEXT_MENU, '5_history'], { | ||
| commandId: GitHistoryCommands.OPEN_FILE_HISTORY.id | ||
| }); | ||
|
|
||
| super.registerMenus(menus); | ||
| } | ||
|
|
||
| registerCommands(commands: CommandRegistry): void { | ||
| commands.registerCommand(GitHistoryCommands.OPEN_FILE_HISTORY, this.newFileHandler({ | ||
| execute: async uri => { | ||
| const options: Git.Options.Log = { | ||
| uri: uri.toString(), | ||
| maxCount: GIT_HISTORY_MAX_COUNT | ||
| }; | ||
| this.showWidget(options); | ||
| } | ||
| })); | ||
| commands.registerCommand(GitHistoryCommands.OPEN_BRANCH_HISTORY, { | ||
| execute: () => { | ||
| this.showWidget({ | ||
| maxCount: GIT_HISTORY_MAX_COUNT | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| async showWidget(options?: Git.Options.Log) { | ||
| const widget = await this.widget; | ||
| await widget.setContent(options); | ||
| this.openView({ | ||
| toggle: true, | ||
| activate: true | ||
| }); | ||
| } | ||
|
|
||
| protected newFileHandler(handler: UriCommandHandler): FileSystemCommandHandler { | ||
| return new FileSystemCommandHandler(this.selectionService, handler); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
packages/git/src/browser/history/git-history-frontend-module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright (C) 2018 TypeFox and others. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| */ | ||
|
|
||
| import { GitHistoryContribution, GIT_HISTORY } from "./git-history-contribution"; | ||
| import { interfaces } from "inversify"; | ||
| import { CommandContribution, MenuContribution, KeybindingContribution } from "@theia/core"; | ||
| import { WidgetFactory } from "@theia/core/lib/browser"; | ||
| import { GitHistoryWidget } from "./git-history-widget"; | ||
|
|
||
| import '../../../src/browser/style/history.css'; | ||
|
|
||
| export function bindGitHistoryModule(bind: interfaces.Bind) { | ||
|
|
||
| bind(GitHistoryWidget).toSelf(); | ||
| bind(WidgetFactory).toDynamicValue(ctx => ({ | ||
| id: GIT_HISTORY, | ||
| createWidget: () => ctx.container.get<GitHistoryWidget>(GitHistoryWidget) | ||
| })); | ||
|
|
||
| bind(GitHistoryContribution).toSelf().inSingletonScope(); | ||
| for (const identifier of [CommandContribution, MenuContribution, KeybindingContribution]) { | ||
| bind(identifier).toDynamicValue(ctx => | ||
| ctx.container.get(GitHistoryContribution) | ||
| ).inSingletonScope(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.