Skip to content

Commit 3f1c281

Browse files
committed
Add git commit action to footer with dynamic repository state tracking
- in Footer, to the right of 'Undo', place 'Commit'/'Zakomituj'. Enabled when there is something to commit in the workspace. - now, we're getting such error [Pasted text] [Changes] └── apps └── editor └── src ├── utils │ └── git-repository-utils.ts └── views └── prompt ├── backend │ ├── message-handlers │ │ └── handle-get-workspace-state.ts │ └── prompt-view-provider.ts ├── frontend │ ├── Prompt.tsx │ ├── components │ │ └── Layout │ │ └── Footer │ │ └── Footer.tsx │ ├── contexts │ │ └── LayoutContext.tsx │ ├── hooks │ │ ├── use-editor-sync.ts │ │ └── use-prompt │ │ └── use-prompt.ts │ └── i18n │ └── translations │ └── footer.ts └── types └── messages.ts
1 parent 63637bf commit 3f1c281

9 files changed

Lines changed: 160 additions & 11 deletions

File tree

‎apps/editor/src/utils/git-repository-utils.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export type GitRepository = {
3232
show: (ref: string, path: string) => Promise<string>
3333
}
3434

35-
const get_all_git_repositories = (): GitRepository[] | null => {
35+
const get_all_git_repositories = async (): Promise<GitRepository[] | null> => {
3636
const git_extension = vscode.extensions.getExtension('vscode.git')
3737
if (!git_extension) {
3838
vscode.window.showWarningMessage(
@@ -41,8 +41,19 @@ const get_all_git_repositories = (): GitRepository[] | null => {
4141
return null
4242
}
4343

44-
const git_api = git_extension.exports.getAPI(1)
45-
const repositories: GitRepository[] = git_api.repositories
44+
if (!git_extension.isActive) {
45+
try {
46+
await git_extension.activate()
47+
} catch {
48+
vscode.window.showWarningMessage(
49+
t('common.warning.git-integration-missing')
50+
)
51+
return null
52+
}
53+
}
54+
55+
const git_api = git_extension.exports?.getAPI(1)
56+
const repositories: GitRepository[] | undefined = git_api?.repositories
4657

4758
if (!repositories || repositories.length === 0) {
4859
vscode.window.showWarningMessage(
@@ -57,7 +68,7 @@ const get_all_git_repositories = (): GitRepository[] | null => {
5768
export const get_git_repository = async (
5869
source_control?: vscode.SourceControl
5970
): Promise<GitRepository | null> => {
60-
const repositories = get_all_git_repositories()
71+
const repositories = await get_all_git_repositories()
6172
if (!repositories) return null
6273

6374
if (source_control?.rootUri) {
@@ -131,7 +142,7 @@ export const get_git_repository = async (
131142
export const get_repository_for_commit = async (
132143
source_control?: vscode.SourceControl
133144
): Promise<GitRepository | null> => {
134-
const repositories = get_all_git_repositories()
145+
const repositories = await get_all_git_repositories()
135146
if (!repositories) return null
136147

137148
if (source_control?.rootUri) {
Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
11
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
2+
import * as vscode from 'vscode'
3+
4+
const get_has_changes_to_commit = (): boolean => {
5+
try {
6+
const git_extension = vscode.extensions.getExtension('vscode.git')
7+
if (!git_extension || !git_extension.isActive) return false
8+
9+
const git_api = git_extension.exports?.getAPI(1)
10+
if (!git_api) return false
11+
12+
const repositories = git_api.repositories
13+
if (!repositories) return false
14+
15+
return repositories.some(
16+
(repo: any) =>
17+
(repo.state.indexChanges && repo.state.indexChanges.length > 0) ||
18+
(repo.state.workingTreeChanges &&
19+
repo.state.workingTreeChanges.length > 0)
20+
)
21+
} catch {
22+
return false
23+
}
24+
}
225

326
export const handle_get_workspace_state = (
427
prompt_view_provider: PromptViewProvider
528
) => {
629
prompt_view_provider.send_message({
730
command: 'WORKSPACE_STATE',
831
folder_count:
9-
prompt_view_provider.workspace_provider.get_workspace_roots().length
32+
prompt_view_provider.workspace_provider.get_workspace_roots().length,
33+
has_changes_to_commit: get_has_changes_to_commit()
1034
})
1135
}

‎apps/editor/src/views/prompt/backend/prompt-view-provider.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,51 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
313313
})
314314
)
315315

316+
const git_extension = vscode.extensions.getExtension('vscode.git')
317+
if (git_extension) {
318+
const setup_git_listeners = () => {
319+
try {
320+
const git_api = git_extension.exports.getAPI(1)
321+
322+
const watch_repo = (repo: any) => {
323+
this.extension_context.subscriptions.push(
324+
repo.state.onDidChange(() => {
325+
handlers.handle_get_workspace_state(this)
326+
})
327+
)
328+
}
329+
330+
if (git_api.repositories) {
331+
git_api.repositories.forEach(watch_repo)
332+
}
333+
334+
this.extension_context.subscriptions.push(
335+
git_api.onDidOpenRepository((repo: any) => {
336+
handlers.handle_get_workspace_state(this)
337+
watch_repo(repo)
338+
})
339+
)
340+
341+
this.extension_context.subscriptions.push(
342+
git_api.onDidCloseRepository(() => {
343+
handlers.handle_get_workspace_state(this)
344+
})
345+
)
346+
} catch {
347+
// Ignore
348+
}
349+
}
350+
351+
if (git_extension.isActive) {
352+
setup_git_listeners()
353+
} else {
354+
git_extension.activate().then(() => {
355+
setup_git_listeners()
356+
handlers.handle_get_workspace_state(this)
357+
})
358+
}
359+
}
360+
316361
this._config_listener = vscode.workspace.onDidChangeConfiguration(
317362
(event) => {
318363
if (!this.webview_view) return

‎apps/editor/src/views/prompt/frontend/Prompt.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ export const Prompt = () => {
9696
current_selection,
9797
currently_open_file_text,
9898
selected_files,
99-
workspace_folder_count
99+
workspace_folder_count,
100+
has_changes_to_commit
100101
} = use_editor_sync(vscode)
101102

102103
const {
@@ -259,10 +260,19 @@ export const Prompt = () => {
259260
})
260261
}
261262

263+
const handle_commit_action_click = () => {
264+
post_message(vscode, {
265+
command: 'EXECUTE_COMMAND',
266+
command_id: 'codeWebChat.generateCommitMessage'
267+
})
268+
}
269+
262270
const layout_context_value = {
263271
can_undo,
272+
has_changes_to_commit,
264273
on_apply_click: handle_apply_click,
265-
on_undo_click: handle_undo_click
274+
on_undo_click: handle_undo_click,
275+
on_commit_click: handle_commit_action_click
266276
}
267277

268278
const current_state = get_current_instructions_state()

‎apps/editor/src/views/prompt/frontend/components/Layout/Footer/Footer.tsx‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ type Props = {
1515
}
1616

1717
export const Footer: React.FC<Props> = (props) => {
18-
const { can_undo, on_apply_click, on_undo_click } = useContext(LayoutContext)
18+
const {
19+
can_undo,
20+
has_changes_to_commit,
21+
on_apply_click,
22+
on_undo_click,
23+
on_commit_click
24+
} = useContext(LayoutContext)
1925
const { t } = use_translation()
2026
const { container_ref, compact_step } = use_compacting()
2127
const {
@@ -84,6 +90,14 @@ export const Footer: React.FC<Props> = (props) => {
8490
/>
8591
<CompactableActionButton
8692
is_compact={compact_step >= 3}
93+
on_click={on_commit_click}
94+
title={t('footer.commit-title')}
95+
disabled={!has_changes_to_commit}
96+
codicon="git-commit"
97+
label={t('footer.action.commit')}
98+
/>
99+
<CompactableActionButton
100+
is_compact={compact_step >= 4}
87101
on_click={on_apply_click}
88102
title={t('footer.apply-title')}
89103
codicon="check-all"

‎apps/editor/src/views/prompt/frontend/contexts/LayoutContext.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ import { createContext } from 'react'
22

33
type LayoutContextType = {
44
can_undo: boolean
5+
has_changes_to_commit: boolean
56
on_apply_click: () => void
67
on_undo_click: () => void
8+
on_commit_click: () => void
79
}
810

911
export const LayoutContext = createContext<LayoutContextType>({
1012
can_undo: false,
13+
has_changes_to_commit: false,
1114
on_apply_click: () => {},
12-
on_undo_click: () => {}
15+
on_undo_click: () => {},
16+
on_commit_click: () => {}
1317
})

‎apps/editor/src/views/prompt/frontend/hooks/use-editor-sync.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export const use_editor_sync = (vscode: any) => {
1818
const [selected_files, set_selected_files] = useState<string[]>([])
1919
const [workspace_folder_count, set_workspace_folder_count] =
2020
useState<number>()
21+
const [has_changes_to_commit, set_has_changes_to_commit] =
22+
useState<boolean>(false)
2123

2224
useEffect(() => {
2325
const handle_message = (event: MessageEvent<BackendMessage>) => {
@@ -32,6 +34,7 @@ export const use_editor_sync = (vscode: any) => {
3234
set_currently_open_file_text(message.text)
3335
} else if (message.command === 'WORKSPACE_STATE') {
3436
set_workspace_folder_count(message.folder_count)
37+
set_has_changes_to_commit(message.has_changes_to_commit ?? false)
3538
}
3639
}
3740

@@ -53,6 +56,7 @@ export const use_editor_sync = (vscode: any) => {
5356
current_selection,
5457
currently_open_file_text,
5558
selected_files,
56-
workspace_folder_count
59+
workspace_folder_count,
60+
has_changes_to_commit
5761
}
5862
}

‎apps/editor/src/views/prompt/frontend/i18n/translations/footer.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,42 @@ export const footer = {
5555
hu: 'Integrálja a másolt csevegési választ vagy egy aktív terminál-munkamenet CLI-módosításait',
5656
bg: 'Интегрирайте копиран отговор от чата или редакции на CLI от активна терминална сесия'
5757
},
58+
'footer.action.commit': {
59+
en: 'Commit',
60+
pl: 'Zakomituj',
61+
'zh-cn': '提交',
62+
ja: 'コミット',
63+
'zh-tw': '提交',
64+
de: 'Commit',
65+
es: 'Hacer commit',
66+
fr: 'Valider',
67+
'pt-br': 'Fazer commit',
68+
ru: 'Зафиксировать',
69+
ko: '커밋',
70+
it: 'Commit',
71+
tr: 'İşle',
72+
cs: 'Potvrdit',
73+
hu: 'Véglegesítés',
74+
bg: 'Комитни'
75+
},
76+
'footer.commit-title': {
77+
en: 'Generate a commit message and commit changes',
78+
pl: 'Wygeneruj wiadomość commita i zatwierdź zmiany',
79+
'zh-cn': '生成提交消息并提交更改',
80+
ja: 'コミットメッセージを生成して変更をコミットする',
81+
'zh-tw': '生成提交訊息並提交更改',
82+
de: 'Erstellen Sie eine Commit-Nachricht und übernehmen Sie die Änderungen',
83+
es: 'Generar un mensaje de commit y confirmar los cambios',
84+
fr: 'Générer un message de validation et valider les modifications',
85+
'pt-br': 'Gerar uma mensagem de commit e confirmar as alterações',
86+
ru: 'Сгенерировать сообщение коммита и зафиксировать изменения',
87+
ko: '커밋 메시지를 생성하고 변경 사항을 커밋합니다',
88+
it: 'Genera un messaggio di commit e conferma le modifiche',
89+
tr: 'Bir commit mesajı oluştur ve değişiklikleri işle',
90+
cs: 'Vygenerovat zprávu o potvrzení a potvrdit změny',
91+
hu: 'Generáljon egy véglegesítési üzenetet és véglegesítse a módosításokat',
92+
bg: 'Генерирайте съобщение за комит и потвърдете промените'
93+
},
5894
'footer.action.apply': {
5995
en: 'Apply...',
6096
pl: 'Integruj...',

‎apps/editor/src/views/prompt/types/messages.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,7 @@ export interface ResponsePreviewFinishedMessage extends BaseMessage {
980980
export interface WorkspaceStateMessage extends BaseMessage {
981981
command: 'WORKSPACE_STATE'
982982
folder_count: number
983+
has_changes_to_commit?: boolean
983984
}
984985

985986
export interface SelectedWebConfigurationChangedMessage extends BaseMessage {

0 commit comments

Comments
 (0)