-
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.
Show file changes as a tree in Source Control view
Signed-off-by: Nigel Westbury <nigelipse@miegel.org>
- Loading branch information
Showing
15 changed files
with
1,385 additions
and
670 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
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,87 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2020 Arm and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| import { injectable, inject } from 'inversify'; | ||
| import { Message } from '@phosphor/messaging'; | ||
| import { SelectionService } from '@theia/core/lib/common'; | ||
| import * as React from 'react'; | ||
| import { | ||
| ContextMenuRenderer, ReactWidget, LabelProvider, KeybindingRegistry, StorageService | ||
| } from '@theia/core/lib/browser'; | ||
| import { ScmService } from './scm-service'; | ||
| import { ScmAvatarService } from './scm-avatar-service'; | ||
| import { ScmAmendComponent } from './scm-amend-component'; | ||
|
|
||
| @injectable() | ||
| export class ScmAmendWidget extends ReactWidget { | ||
|
|
||
| static ID = 'scm-amend-widget'; | ||
|
|
||
| @inject(ScmService) protected readonly scmService: ScmService; | ||
| @inject(ScmAvatarService) protected readonly avatarService: ScmAvatarService; | ||
| @inject(StorageService) protected readonly storageService: StorageService; | ||
| @inject(SelectionService) protected readonly selectionService: SelectionService; | ||
| @inject(LabelProvider) protected readonly labelProvider: LabelProvider; | ||
| @inject(KeybindingRegistry) protected readonly keybindings: KeybindingRegistry; | ||
|
|
||
| protected shouldScrollToRow = true; | ||
|
|
||
| constructor( | ||
| @inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer, | ||
| ) { | ||
| super(); | ||
| this.scrollOptions = { | ||
| suppressScrollX: true, | ||
| minScrollbarLength: 35 | ||
| }; | ||
| this.addClass('theia-scm-commit-container'); | ||
| this.id = ScmAmendWidget.ID; | ||
| } | ||
|
|
||
| protected onUpdateRequest(msg: Message): void { | ||
| if (!this.isAttached || !this.isVisible) { | ||
| return; | ||
| } | ||
| super.onUpdateRequest(msg); | ||
| } | ||
|
|
||
| protected render(): React.ReactNode { | ||
| const repository = this.scmService.selectedRepository; | ||
| if (repository && repository.provider.amendSupport) { | ||
| return React.createElement( | ||
| ScmAmendComponent, | ||
| { | ||
| key: `amend:${repository.provider.rootUri}`, | ||
| style: { flexGrow: 0 }, | ||
| id: 'amend', // ??? this was hack {this.scrollContainer} | ||
| repository: repository, | ||
| scmAmendSupport: repository.provider.amendSupport, | ||
| setCommitMessage: this.setInputValue, | ||
| avatarService: this.avatarService, | ||
| storageService: this.storageService, | ||
| } | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| protected setInputValue = (event: React.FormEvent<HTMLTextAreaElement> | React.ChangeEvent<HTMLTextAreaElement> | string) => { | ||
| const repository = this.scmService.selectedRepository; | ||
| if (repository) { | ||
| repository.input.value = typeof event === 'string' ? event : event.currentTarget.value; | ||
| } | ||
| }; | ||
|
|
||
| } |
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,170 @@ | ||
| /******************************************************************************** | ||
| * Copyright (C) 2018 TypeFox and others. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the Eclipse | ||
| * Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
| * with the GNU Classpath Exception which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| ********************************************************************************/ | ||
|
|
||
| import { injectable, inject, postConstruct } from 'inversify'; | ||
| import { Message } from '@phosphor/messaging'; | ||
| import { SelectionService } from '@theia/core/lib/common'; | ||
| import * as React from 'react'; | ||
| import TextareaAutosize from 'react-autosize-textarea'; | ||
| import { ScmInput } from './scm-input'; | ||
| import { | ||
| ContextMenuRenderer, ReactWidget, LabelProvider, KeybindingRegistry, StatefulWidget} from '@theia/core/lib/browser'; | ||
| import { ScmService } from './scm-service'; | ||
|
|
||
| @injectable() | ||
| export class ScmCommitWidget extends ReactWidget implements StatefulWidget { | ||
|
|
||
| static ID = 'scm-commit-widget'; | ||
|
|
||
| @inject(ScmService) protected readonly scmService: ScmService; | ||
| @inject(SelectionService) protected readonly selectionService: SelectionService; | ||
| @inject(LabelProvider) protected readonly labelProvider: LabelProvider; | ||
| @inject(KeybindingRegistry) protected readonly keybindings: KeybindingRegistry; | ||
|
|
||
| protected shouldScrollToRow = true; | ||
|
|
||
| /** don't modify DOM use React! only exposed for `focusInput` */ | ||
| protected readonly inputRef = React.createRef<HTMLTextAreaElement>(); | ||
|
|
||
| constructor( | ||
| @inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer, | ||
| ) { | ||
| super(); | ||
| this.scrollOptions = { | ||
| suppressScrollX: true, | ||
| minScrollbarLength: 35 | ||
| }; | ||
| this.addClass('theia-ScmCommit'); | ||
| this.id = ScmCommitWidget.ID; | ||
| } | ||
|
|
||
| @postConstruct() | ||
| protected init(): void { | ||
|
|
||
| } | ||
|
|
||
| protected onActivateRequest(msg: Message): void { | ||
| super.onActivateRequest(msg); | ||
| this.focus(); | ||
| } | ||
|
|
||
| public focus(): boolean { | ||
| (this.inputRef.current || this.node).focus(); | ||
| return true; // returns false to set parent node focus - tidy this up | ||
| } | ||
|
|
||
| protected onUpdateRequest(msg: Message): void { | ||
| if (!this.isAttached || !this.isVisible) { | ||
| return; | ||
| } | ||
| super.onUpdateRequest(msg); | ||
| } | ||
|
|
||
| protected render(): React.ReactNode { | ||
| const repository = this.scmService.selectedRepository; | ||
| if (repository) { | ||
| return React.createElement('div', this.createContainerAttributes(), this.renderInput(repository.input)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Create the container attributes for the widget. | ||
| */ | ||
| protected createContainerAttributes(): React.HTMLAttributes<HTMLElement> { | ||
| return { | ||
| style: { flexGrow: 0 } | ||
| }; | ||
| } | ||
|
|
||
| protected renderInput(input: ScmInput): React.ReactNode { | ||
| const validationStatus = input.issue ? input.issue.type : 'idle'; | ||
| const validationMessage = input.issue ? input.issue.message : ''; | ||
| const format = (value: string, ...args: string[]): string => { | ||
| if (args.length !== 0) { | ||
| return value.replace(/{(\d+)}/g, (found, n) => { | ||
| const i = parseInt(n); | ||
| return isNaN(i) || i < 0 || i >= args.length ? found : args[i]; | ||
| }); | ||
| } | ||
| return value; | ||
| }; | ||
|
|
||
| const keybinding = this.keybindings.acceleratorFor(this.keybindings.getKeybindingsForCommand('scm.acceptInput')[0]).join('+'); | ||
| const message = format(input.placeholder || '', keybinding); | ||
| return <div className={ScmCommitWidget.Styles.INPUT_MESSAGE_CONTAINER}> | ||
| <TextareaAutosize | ||
| className={`${ScmCommitWidget.Styles.INPUT_MESSAGE} theia-input theia-scm-input-message-${validationStatus}`} | ||
| id={ScmCommitWidget.Styles.INPUT_MESSAGE} | ||
| placeholder={message} | ||
| autoFocus={true} | ||
| value={input.value} | ||
| onChange={this.setInputValue} | ||
| ref={this.inputRef} | ||
| rows={1} | ||
| maxRows={6} /* from VS Code */> | ||
| </TextareaAutosize> | ||
| <div | ||
| className={ | ||
| `${ScmCommitWidget.Styles.VALIDATION_MESSAGE} ${ScmCommitWidget.Styles.NO_SELECT} | ||
| theia-scm-validation-message-${validationStatus} theia-scm-input-message-${validationStatus}` | ||
| } | ||
| style={{ | ||
| display: !!input.issue ? 'block' : 'none' | ||
| }}>{validationMessage}</div> | ||
| </div>; | ||
| } | ||
|
|
||
| protected setInputValue = (event: React.FormEvent<HTMLTextAreaElement> | React.ChangeEvent<HTMLTextAreaElement> | string) => { | ||
| const repository = this.scmService.selectedRepository; | ||
| if (repository) { | ||
| repository.input.value = typeof event === 'string' ? event : event.currentTarget.value; | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Store the tree state. | ||
| */ | ||
| storeState(): object { | ||
| const message = this.inputRef.current ? this.inputRef.current.value : ''; | ||
| const state: object = { | ||
| message | ||
| }; | ||
| return state; | ||
| } | ||
|
|
||
| /** | ||
| * Restore the state. | ||
| * @param oldState the old state object. | ||
| */ | ||
| restoreState(oldState: object): void { | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| const { message } = (oldState as any); | ||
| if (message && this.inputRef.current) { | ||
| this.inputRef.current.value = message; | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| export namespace ScmCommitWidget { | ||
|
|
||
| export namespace Styles { | ||
| export const INPUT_MESSAGE_CONTAINER = 'theia-scm-input-message-container'; | ||
| export const INPUT_MESSAGE = 'theia-scm-input-message'; | ||
| export const VALIDATION_MESSAGE = 'theia-scm-input-validation-message'; | ||
| export const NO_SELECT = 'no-select'; | ||
| } | ||
| } |
Oops, something went wrong.