hanzoai/code
2
0
Fork 0
mirror of https://github.com/hanzoai/code.git synced 2026-09-30 20:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

small changes..

Browse Source
This commit is contained in:
Mathew Pareles
2025-03-18 03:43:12 -07:00
parent 5edad0afe9
commit 401e8a6102
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx
+10 -26
View File
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------*/
import { useAccessor, useIsDark } from '../util/services.js'; import { useAccessor, useIsDark, useUriState } from '../util/services.js';
import '../styles.css' import '../styles.css'
import { DiffZone } from '../../../editCodeService.js'; import { DiffZone } from '../../../editCodeService.js';
@@ -39,16 +39,7 @@ const VoidCommandBar = () => {
const [diffIdxOfFspath, setDiffIdxOfFspath] = useState<Record<string, number | undefined>>({}) const [diffIdxOfFspath, setDiffIdxOfFspath] = useState<Record<string, number | undefined>>({})
// const [currentUriIdx, setCurrentUriIdx] = useState(-1) // we are doing O(n) search for this // const [currentUriIdx, setCurrentUriIdx] = useState(-1) // we are doing O(n) search for this
const getCurrentUri = useCallback(() => { const { currentUri } = useUriState()
const editor = editorService.getActiveCodeEditor()
if (!editor) return null
const uri = editor.getModel()?.uri
if (!uri) return null
return uri
}, [editorService])
const diffZones: DiffZone[] = []
// trigger rerender when diffzone is created (TODO need to also update when diff is accepted/rejected) // trigger rerender when diffzone is created (TODO need to also update when diff is accepted/rejected)
useEffect(() => { useEffect(() => {
@@ -58,11 +49,7 @@ const VoidCommandBar = () => {
return () => disposable.dispose() return () => disposable.dispose()
}, [editCodeService, rerender]) }, [editCodeService, rerender])
const getNextDiff = useCallback(({ step }: { step: 1 | -1 }) => { const getNextDiff = useCallback(({ step }: { step: 1 | -1 }) => {
const currentUri = getCurrentUri()
if (!currentUri) { if (!currentUri) {
return; return;
} }
@@ -78,9 +65,9 @@ const VoidCommandBar = () => {
const nextDiff = sortedDiffs[nextDiffIdx] const nextDiff = sortedDiffs[nextDiffIdx]
return { nextDiff, nextDiffIdx, } return { nextDiff, nextDiffIdx }
}, [getCurrentUri, editCodeService._sortedDiffsOfFspath, diffIdxOfFspath]) }, [currentUri, editCodeService._sortedDiffsOfFspath, diffIdxOfFspath])
const getNextUri = useCallback(({ step }: { step: 1 | -1 }) => { const getNextUri = useCallback(({ step }: { step: 1 | -1 }) => {
@@ -89,8 +76,6 @@ const VoidCommandBar = () => {
return; return;
} }
const currentUri = getCurrentUri()
const defaultUriIdx = step === 1 ? -1 : 0 // defaults: if next, currentIdx = -1; if prev, currentIdx = 0 const defaultUriIdx = step === 1 ? -1 : 0 // defaults: if next, currentIdx = -1; if prev, currentIdx = 0
let currentUriIdx = -1 let currentUriIdx = -1
if (currentUri) { if (currentUri) {
@@ -104,15 +89,14 @@ const VoidCommandBar = () => {
const nextUriIdx = (currentUriIdx + step) % sortedUris.length const nextUriIdx = (currentUriIdx + step) % sortedUris.length
const nextUri = sortedUris[nextUriIdx] const nextUri = sortedUris[nextUriIdx]
return { nextUri, nextUriIdx, } return { nextUri, nextUriIdx }
}, [getCurrentUri, editCodeService._sortedUrisWithDiffs])
}, [currentUri, editCodeService._sortedUrisWithDiffs])
const gotoNextDiff = ({ step }: { step: 1 | -1 }) => { const gotoNextDiff = ({ step }: { step: 1 | -1 }) => {
// get the next diff // get the next diff
const res = getNextDiff({ step: 1 }) const res = getNextDiff({ step })
if (!res) return; if (!res) return;
// scroll to the next diff // scroll to the next diff
@@ -132,7 +116,7 @@ const VoidCommandBar = () => {
const gotoNextUri = ({ step }: { step: 1 | -1 }) => { const gotoNextUri = ({ step }: { step: 1 | -1 }) => {
// get the next uri // get the next uri
const res = getNextUri({ step: 1 }) const res = getNextUri({ step })
if (!res) return; if (!res) return;
const { nextUri, nextUriIdx } = res; const { nextUri, nextUriIdx } = res;
@@ -197,8 +181,8 @@ const VoidCommandBar = () => {
</div> </div>
<div className="text-[var(--vscode-editor-foreground)] text-xs flex gap-4"> <div className="text-[var(--vscode-editor-foreground)] text-xs flex gap-4">
<div>File {(editCodeService._sortedUrisWithDiffs.findIndex(u => u.fsPath === getCurrentUri()?.fsPath) ?? 0) + 1} of {editCodeService._sortedUrisWithDiffs.length}</div> <div>File {(editCodeService._sortedUrisWithDiffs.findIndex(u => u.fsPath === currentUri?.fsPath) ?? 0) + 1} of {editCodeService._sortedUrisWithDiffs.length}</div>
<div>Diff {(diffIdxOfFspath[getCurrentUri()?.fsPath ?? ''] ?? 0) + 1} of {editCodeService._sortedDiffsOfFspath[getCurrentUri()?.fsPath ?? '']?.length ?? 0}</div> <div>Diff {(diffIdxOfFspath[currentUri?.fsPath ?? ''] ?? 0) + 1} of {editCodeService._sortedDiffsOfFspath[currentUri?.fsPath ?? '']?.length ?? 0}</div>
</div> </div>
</div> </div>