Eric Amodio
7 роки тому
20 змінених файлів з 1552 додано та 1529 видалено
Розділений перегляд
Параметри порівняння
-
+2 -1CHANGELOG.md
-
+2 -0README.md
-
+1339 -1347package.json
-
+25 -3src/annotations/annotationController.ts
-
+0 -2src/commands.ts
-
+0 -22src/commands/common.ts
-
+22 -0src/constants.ts
-
+2 -3src/extension.ts
-
+1 -1src/git/gitContextTracker.ts
-
+1 -2src/gitService.ts
-
+142 -139src/keyboard.ts
-
+2 -1src/quickPicks/branchHistory.ts
-
+2 -1src/quickPicks/commitDetails.ts
-
+2 -1src/quickPicks/commitFileDetails.ts
-
+1 -1src/quickPicks/commits.ts
-
+2 -1src/quickPicks/common.ts
-
+2 -1src/quickPicks/fileHistory.ts
-
+2 -1src/quickPicks/repoStatus.ts
-
+2 -1src/quickPicks/stashList.ts
+ 2
- 1
CHANGELOG.md
Переглянути файл
+ 2
- 0
README.md
Переглянути файл
+ 1339
- 1347
package.json
Різницю між файлами не показано, бо вона завелика
Переглянути файл
+ 25
- 3
src/annotations/annotationController.ts
Переглянути файл
+ 0
- 2
src/commands.ts
Переглянути файл
+ 0
- 22
src/commands/common.ts
Переглянути файл
+ 22
- 0
src/constants.ts
Переглянути файл
+ 2
- 3
src/extension.ts
Переглянути файл
+ 1
- 1
src/git/gitContextTracker.ts
Переглянути файл
+ 1
- 2
src/gitService.ts
Переглянути файл
src/commands/keyboard.ts → src/keyboard.ts
Переглянути файл
| @ -1,140 +1,143 @@ | |||
| 'use strict'; | |||
| import { commands, Disposable } from 'vscode'; | |||
| import { CommandContext, setCommandContext } from './common'; | |||
| import { ExtensionKey } from '../constants'; | |||
| import { QuickPickItem } from '../quickPicks'; | |||
| import { Logger } from '../logger'; | |||
| const keyNoopCommand = Object.create(null) as QuickPickItem; | |||
| export { keyNoopCommand as KeyNoopCommand }; | |||
| export declare type Keys = 'left' | 'right' | ',' | '.'; | |||
| export const keys: Keys[] = [ | |||
| 'left', | |||
| 'right', | |||
| ',', | |||
| '.' | |||
| ]; | |||
| export declare interface KeyMapping { | |||
| [id: string]: (QuickPickItem | (() => Promise<QuickPickItem>) | undefined); | |||
| } | |||
| const mappings: KeyMapping[] = []; | |||
| let _instance: Keyboard; | |||
| export class KeyboardScope extends Disposable { | |||
| constructor(private mapping: KeyMapping) { | |||
| super(() => this.dispose()); | |||
| for (const key in mapping) { | |||
| mapping[key] = mapping[key] || keyNoopCommand; | |||
| } | |||
| } | |||
| async dispose() { | |||
| const index = mappings.indexOf(this.mapping); | |||
| Logger.log('KeyboardScope.dispose', mappings.length, index); | |||
| if (index === (mappings.length - 1)) { | |||
| mappings.pop(); | |||
| await this.updateKeyCommandsContext(mappings[mappings.length - 1]); | |||
| } | |||
| else { | |||
| mappings.splice(index, 1); | |||
| } | |||
| } | |||
| async begin() { | |||
| mappings.push(this.mapping); | |||
| await this.updateKeyCommandsContext(this.mapping); | |||
| return this; | |||
| } | |||
| async clearKeyCommand(key: Keys) { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| if (mapping !== this.mapping || !mapping[key]) return; | |||
| Logger.log('KeyboardScope.clearKeyCommand', mappings.length, key); | |||
| mapping[key] = undefined; | |||
| await setCommandContext(`${CommandContext.Key}:${key}`, false); | |||
| } | |||
| async setKeyCommand(key: Keys, command: QuickPickItem | (() => Promise<QuickPickItem>)) { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| if (mapping !== this.mapping) return; | |||
| Logger.log('KeyboardScope.setKeyCommand', mappings.length, key, !!mapping[key]); | |||
| if (!mapping[key]) { | |||
| mapping[key] = command; | |||
| await setCommandContext(`${CommandContext.Key}:${key}`, true); | |||
| } | |||
| else { | |||
| mapping[key] = command; | |||
| } | |||
| } | |||
| private async updateKeyCommandsContext(mapping: KeyMapping) { | |||
| const promises = []; | |||
| for (const key of keys) { | |||
| promises.push(setCommandContext(`${CommandContext.Key}:${key}`, !!(mapping && mapping[key]))); | |||
| } | |||
| await Promise.all(promises); | |||
| } | |||
| } | |||
| export class Keyboard extends Disposable { | |||
| static get instance(): Keyboard { | |||
| return _instance; | |||
| } | |||
| private _disposable: Disposable; | |||
| constructor() { | |||
| super(() => this.dispose()); | |||
| const subscriptions: Disposable[] = []; | |||
| for (const key of keys) { | |||
| subscriptions.push(commands.registerCommand(`${ExtensionKey}.key.${key}`, () => this.execute(key), this)); | |||
| } | |||
| this._disposable = Disposable.from(...subscriptions); | |||
| _instance = this; | |||
| } | |||
| dispose() { | |||
| this._disposable && this._disposable.dispose(); | |||
| } | |||
| async beginScope(mapping?: KeyMapping): Promise<KeyboardScope> { | |||
| Logger.log('Keyboard.beginScope', mappings.length); | |||
| return await new KeyboardScope(mapping ? Object.assign(Object.create(null), mapping) : Object.create(null)).begin(); | |||
| } | |||
| async execute(key: Keys): Promise<{} | undefined> { | |||
| if (!mappings.length) return undefined; | |||
| try { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| let command = mapping[key] as QuickPickItem | (() => Promise<QuickPickItem>); | |||
| if (typeof command === 'function') { | |||
| command = await command(); | |||
| } | |||
| if (!command || typeof command.onDidPressKey !== 'function') return undefined; | |||
| Logger.log('Keyboard.execute', key); | |||
| return await command.onDidPressKey(key); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'Keyboard.execute'); | |||
| return undefined; | |||
| } | |||
| } | |||
| 'use strict'; | |||
| import { commands, Disposable } from 'vscode'; | |||
| import { CommandContext, ExtensionKey, setCommandContext } from './constants'; | |||
| import { Logger } from './logger'; | |||
| export declare interface KeyCommand { | |||
| onDidPressKey?(key: Keys): Promise<{} | undefined>; | |||
| } | |||
| const keyNoopCommand = Object.create(null) as KeyCommand; | |||
| export { keyNoopCommand as KeyNoopCommand }; | |||
| export declare type Keys = 'left' | 'right' | ',' | '.' | 'escape'; | |||
| export const keys: Keys[] = [ | |||
| 'left', | |||
| 'right', | |||
| ',', | |||
| '.', | |||
| 'escape' | |||
| ]; | |||
| export declare interface KeyMapping { | |||
| [id: string]: (KeyCommand | (() => Promise<KeyCommand>) | undefined); | |||
| } | |||
| const mappings: KeyMapping[] = []; | |||
| let _instance: Keyboard; | |||
| export class KeyboardScope extends Disposable { | |||
| constructor(private mapping: KeyMapping) { | |||
| super(() => this.dispose()); | |||
| for (const key in mapping) { | |||
| mapping[key] = mapping[key] || keyNoopCommand; | |||
| } | |||
| } | |||
| async dispose() { | |||
| const index = mappings.indexOf(this.mapping); | |||
| Logger.log('KeyboardScope.dispose', mappings.length, index); | |||
| if (index === (mappings.length - 1)) { | |||
| mappings.pop(); | |||
| await this.updateKeyCommandsContext(mappings[mappings.length - 1]); | |||
| } | |||
| else { | |||
| mappings.splice(index, 1); | |||
| } | |||
| } | |||
| async begin() { | |||
| mappings.push(this.mapping); | |||
| await this.updateKeyCommandsContext(this.mapping); | |||
| return this; | |||
| } | |||
| async clearKeyCommand(key: Keys) { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| if (mapping !== this.mapping || !mapping[key]) return; | |||
| Logger.log('KeyboardScope.clearKeyCommand', mappings.length, key); | |||
| mapping[key] = undefined; | |||
| await setCommandContext(`${CommandContext.Key}:${key}`, false); | |||
| } | |||
| async setKeyCommand(key: Keys, command: KeyCommand | (() => Promise<KeyCommand>)) { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| if (mapping !== this.mapping) return; | |||
| Logger.log('KeyboardScope.setKeyCommand', mappings.length, key, !!mapping[key]); | |||
| if (!mapping[key]) { | |||
| mapping[key] = command; | |||
| await setCommandContext(`${CommandContext.Key}:${key}`, true); | |||
| } | |||
| else { | |||
| mapping[key] = command; | |||
| } | |||
| } | |||
| private async updateKeyCommandsContext(mapping: KeyMapping) { | |||
| const promises = []; | |||
| for (const key of keys) { | |||
| promises.push(setCommandContext(`${CommandContext.Key}:${key}`, !!(mapping && mapping[key]))); | |||
| } | |||
| await Promise.all(promises); | |||
| } | |||
| } | |||
| export class Keyboard extends Disposable { | |||
| static get instance(): Keyboard { | |||
| return _instance; | |||
| } | |||
| private _disposable: Disposable; | |||
| constructor() { | |||
| super(() => this.dispose()); | |||
| const subscriptions: Disposable[] = []; | |||
| for (const key of keys) { | |||
| subscriptions.push(commands.registerCommand(`${ExtensionKey}.key.${key}`, () => this.execute(key), this)); | |||
| } | |||
| this._disposable = Disposable.from(...subscriptions); | |||
| _instance = this; | |||
| } | |||
| dispose() { | |||
| this._disposable && this._disposable.dispose(); | |||
| } | |||
| async beginScope(mapping?: KeyMapping): Promise<KeyboardScope> { | |||
| Logger.log('Keyboard.beginScope', mappings.length); | |||
| return await new KeyboardScope(mapping ? Object.assign(Object.create(null), mapping) : Object.create(null)).begin(); | |||
| } | |||
| async execute(key: Keys): Promise<{} | undefined> { | |||
| if (!mappings.length) return undefined; | |||
| try { | |||
| const mapping = mappings[mappings.length - 1]; | |||
| let command = mapping[key] as KeyCommand | (() => Promise<KeyCommand>); | |||
| if (typeof command === 'function') { | |||
| command = await command(); | |||
| } | |||
| if (!command || typeof command.onDidPressKey !== 'function') return undefined; | |||
| Logger.log('Keyboard.execute', key); | |||
| return await command.onDidPressKey(key); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'Keyboard.execute'); | |||
| return undefined; | |||
| } | |||
| } | |||
| } | |||