Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: improve inline diff partial edit #4255

Merged
merged 1 commit into from
Dec 25, 2024
+24 −11
Merged

style: improve inline diff partial edit #4255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/ai-native/src/browser/widget/inline-stream-diff/inline-stream-diff.module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,30 @@
.content {
float: right;
display: flex;
border-radius: 4px;
flex-direction: row;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
overflow: hidden;
margin-right: 12px;
max-height: @line-height;
height: @line-height;
align-items: center;
opacity: 0.8;
}

.btn {
display: flex;
pointer-events: auto;
border: none;
font-size: 12px;
font-size: 10px;
cursor: pointer;
padding: 2px 6px;
height: @line-height;
align-items: center;
gap: 4px;

> span {
opacity: 1;
}

&.accept_btn {
background-color: var(--aiNative-inlineDiffAcceptPartialEdit);
Expand Down
8 changes: 5 additions & 3 deletions packages/ai-native/src/browser/widget/inline-stream-diff/live-preview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ReactDOMClient from 'react-dom/client';
import { Autowired, Injectable } from '@opensumi/di';
import { KeybindingRegistry, useDisposable } from '@opensumi/ide-core-browser';
import { AI_INLINE_DIFF_PARTIAL_EDIT } from '@opensumi/ide-core-browser/lib/ai-native/command';
import { Emitter, Event, IPosition, isDefined, isUndefined, uuid } from '@opensumi/ide-core-common';
import { Emitter, Event, IPosition, isDefined, isUndefined, localize, uuid } from '@opensumi/ide-core-common';
import {
ICodeEditor,
IEditorDecorationsCollection,
Expand Down Expand Up @@ -114,10 +114,12 @@ const PartialEditComponent = (props: {
>
<div className={styles.content}>
<span className={cls(styles.accept_btn, styles.btn)} onClick={handleAccept}>
{keyStrings.acceptSequence}
{localize('aiNative.inline.diff.accept')}
<span>{keyStrings.acceptSequence}</span>
</span>
<span className={cls(styles.discard_btn, styles.btn)} onClick={handleDiscard}>
{keyStrings.discardSequence}
{localize('aiNative.inline.diff.reject')}
<span>{keyStrings.discardSequence}</span>
</span>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion packages/i18n/src/common/en-US.lang.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,8 +1457,9 @@ export const localizationBundle = {
'aiNative.inline.chat.operate.loading.cancel': 'Esc to cancel',
'aiNative.inline.chat.input.placeholder.default': 'Ask Copilot（shift + enter newline）',
'aiNative.inline.hint.widget.placeholder': '{0} to inline chat',

'aiNative.inline.problem.fix.title': 'Fix with AI',
'aiNative.inline.diff.accept': 'Accept',
'aiNative.inline.diff.reject': 'Reject',

'aiNative.resolve.conflict.dialog.afresh': 'Are you sure you want to regenerate?',
'aiNative.resolve.conflict.dialog.detection':
Expand Down
3 changes: 2 additions & 1 deletion packages/i18n/src/common/zh-CN.lang.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,8 +1223,9 @@ export const localizationBundle = {
'aiNative.inline.chat.operate.loading.cancel': '按 ESC 取消',
'aiNative.inline.chat.input.placeholder.default': '可以问我任何问题，支持 shift + 回车换行',
'aiNative.inline.hint.widget.placeholder': '按 {0} 唤起 Inline Chat',

'aiNative.inline.problem.fix.title': 'AI 修复',
'aiNative.inline.diff.accept': '采纳',
'aiNative.inline.diff.reject': '拒绝',

'aiNative.resolve.conflict.dialog.afresh': '你确定要重新生成吗？',
'aiNative.resolve.conflict.dialog.detection':
Expand Down
6 changes: 3 additions & 3 deletions packages/theme/src/common/color-tokens/ai-native.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ export const designInlineDiffRemovedRange = registerColor(

export const designInlineDiffAcceptPartialEdit = registerColor(
'aiNative.inlineDiffAcceptPartialEdit',
{ dark: transparent(defaultInsertColor, 3), light: transparent(defaultInsertColor, 3), hcDark: null, hcLight: null },
{ dark: '#89d185', light: '#89d185', hcDark: null, hcLight: null },
'',
true,
);

export const designInlineDiffAcceptPartialEditForeground = registerColor(
'aiNative.inlineDiffAcceptPartialEdit.foreground',
{ dark: '#fff', light: '#fff', hcDark: null, hcLight: null },
{ dark: '#1f1f1f', light: '#1f1f1f', hcDark: null, hcLight: null },
'',
true,
);

export const designInlineDiffDiscardPartialEdit = registerColor(
'aiNative.inlineDiffDiscardPartialEdit',
{ dark: transparent(defaultRemoveColor, 3), light: transparent(defaultRemoveColor, 3), hcDark: null, hcLight: null },
{ dark: '#f14c4c', light: '#f14c4c', hcDark: null, hcLight: null },
'',
true,
);
Expand Down
Loading