kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278 from jdanbrown/more-move-commands

Browse Source 
More move commands: section/change/hunk, unstaged/staged changes
This commit is contained in:
Kristian Andersen Hole 2023-10-08 17:40:16 +02:00 committed by GitHub
commit 8829229881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 105 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/commands/macros.ts
View File

@ -4,6 +4,7 @@ import { ChangeSectionView } from '../views/changes/changesSectionView';
import { ChangeView } from '../views/changes/changeView';
import { DocumentView } from '../views/general/documentView';
import { View } from '../views/general/view';
import { HunkView } from '../views/changes/hunkView';
export async function saveClose() {
await commands.executeCommand('workbench.action.files.save');
@ -58,11 +59,43 @@ const subViewDepthSearchFlatten = (view: View, depth: number = 0): View[] => {
};
export async function moveToNextEntity(repo: MagitRepository, view: DocumentView) {
moveToEntity(view, 'next');
moveToNextPreviousEntity(view, 'next', 'entity');
}
export async function moveToPreviousEntity(repo: MagitRepository, view: DocumentView) {
moveToEntity(view, 'previous');
moveToNextPreviousEntity(view, 'previous', 'entity');
}
export async function moveToNextSection(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'next', 'section');
}
export async function moveToPreviousSection(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'previous', 'section');
}
export async function moveToNextChange(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'next', 'change');
}
export async function moveToPreviousChange(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'previous', 'change');
}
export async function moveToNextHunk(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'next', 'hunk');
}
export async function moveToPreviousHunk(repo: MagitRepository, view: DocumentView) {
moveToNextPreviousEntity(view, 'previous', 'hunk');
}
export async function moveToUnstagedChanges(repo: MagitRepository, view: DocumentView) {
moveToTargetEntity(view, 'unstaged-changes');
}
export async function moveToStagedChanges(repo: MagitRepository, view: DocumentView) {
moveToTargetEntity(view, 'staged-changes');
}
function moveCursorAndReveal(position: Position) {
@ -70,12 +103,44 @@ function moveCursorAndReveal(position: Position) {
window.activeTextEditor!.revealRange(new Selection(position, position), TextEditorRevealType.Default);
}
function moveToEntity(view: View, direction: 'next' | 'previous') {
function moveToTargetEntity(view: View, target: 'unstaged-changes' | 'staged-changes') {
let views = (
[view, ...subViewDepthSearchFlatten(view)]
.filter(v =>
target === 'unstaged-changes' ? v instanceof ChangeSectionView && v.section === 'Unstaged changes' :
target === 'staged-changes' ? v instanceof ChangeSectionView && v.section === 'Staged changes' :
false // Unreachable
)
);
let targetView = views[0];
if (targetView) {
let nextLocation = targetView.range.start;
moveCursorAndReveal(nextLocation);
}
}
function moveToNextPreviousEntity(
view: View,
direction: 'next' | 'previous',
filter: 'entity' | 'section' | 'change' | 'hunk',
) {
const selectedView = view.click(window.activeTextEditor!.selection.active);
if (selectedView) {
let foldableViews = [view, ...subViewDepthSearchFlatten(view)];
let foldableViews = (
[view, ...subViewDepthSearchFlatten(view)]
.filter(v =>
v === selectedView || (
filter === 'entity' ? true :
filter === 'section' ? v.constructor.name.endsWith('SectionView') :
filter === 'change' ? v instanceof ChangeView :
filter === 'hunk' ? v instanceof HunkView :
false // Unreachable
)
)
);
if (direction === 'previous') {
foldableViews = foldableViews.reverse();
@ -94,16 +159,17 @@ function moveToEntity(view: View, direction: 'next' | 'previous') {
}
}
// Avoid standing still and getting stuck
if (direction === 'next') {
let newPos = selectedView.range.end.with({ line: selectedView.range.end.line });
moveCursorAndReveal(newPos);
} else if (direction === 'previous') {
if (selectedView.range.start.line > 0) {
let newPos = selectedView.range.start.with({ line: selectedView.range.start.line - 1 });
if (filter === 'entity') {
// Avoid standing still and getting stuck
if (direction === 'next') {
let newPos = selectedView.range.end.with({ line: selectedView.range.end.line });
moveCursorAndReveal(newPos);
} else if (direction === 'previous') {
if (selectedView.range.start.line > 0) {
let newPos = selectedView.range.start.with({ line: selectedView.range.start.line - 1 });
moveCursorAndReveal(newPos);
}
}
}
}
}
}

27
src/extension.ts
View File

@ -9,7 +9,23 @@ import { magitVisitAtPoint } from './commands/visitAtPointCommands';
import { MagitRepository } from './models/magitRepository';
import { magitCommit, setCodePath } from './commands/commitCommands';
import { magitStage, magitStageAll, magitUnstageAll, magitUnstage, stageFile, unstageFile } from './commands/stagingCommands';
import { saveClose, clearSaveClose, quitMagitView, toggleAllFoldsForChangeViews, toggleAllFoldsInChangeSection, moveToPreviousEntity, moveToNextEntity } from './commands/macros';
import {
saveClose,
clearSaveClose,
quitMagitView,
toggleAllFoldsForChangeViews,
toggleAllFoldsInChangeSection,
moveToPreviousEntity,
moveToNextEntity,
moveToNextSection,
moveToPreviousSection,
moveToNextChange,
moveToPreviousChange,
moveToNextHunk,
moveToPreviousHunk,
moveToUnstagedChanges,
moveToStagedChanges,
} from './commands/macros';
import HighlightProvider from './providers/highlightProvider';
import SemanticTokensProvider from './providers/semanticTokensProvider';
import { CommandPrimer } from './commands/commandPrimer';
@ -178,6 +194,15 @@ export function activate(context: ExtensionContext) {
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-next-entity', CommandPrimer.primeRepoAndView(moveToNextEntity, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-previous-entity', CommandPrimer.primeRepoAndView(moveToPreviousEntity, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-next-section', CommandPrimer.primeRepoAndView(moveToNextSection, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-previous-section', CommandPrimer.primeRepoAndView(moveToPreviousSection, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-next-change', CommandPrimer.primeRepoAndView(moveToNextChange, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-previous-change', CommandPrimer.primeRepoAndView(moveToPreviousChange, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-next-hunk', CommandPrimer.primeRepoAndView(moveToNextHunk, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-previous-hunk', CommandPrimer.primeRepoAndView(moveToPreviousHunk, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-to-unstaged-changes', CommandPrimer.primeRepoAndView(moveToUnstagedChanges, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.move-to-staged-changes', CommandPrimer.primeRepoAndView(moveToStagedChanges, false)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.toggle-all-folds-in-change-section-at-point', CommandPrimer.primeRepoAndView(toggleAllFoldsInChangeSection, true)));
context.subscriptions.push(commands.registerTextEditorCommand('magit.toggle-all-folds-for-change-views', CommandPrimer.primeRepoAndView(toggleAllFoldsForChangeViews, true)));