Skip to content

Commit f021cfc

Browse files
committed
merge roo main again
1 parent 6cfca6b commit f021cfc

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

src/shared/ExtensionMessage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Mode, CustomModePrompts, ModeConfig, defaultModeSlug, defaultPrompts }
66
import { CustomSupportPrompts } from "./support-prompt"
77
import { experimentDefault, ExperimentId } from "./experiments"
88
import { TERMINAL_OUTPUT_LIMIT } from "./terminal"
9-
import { ClineMessage } from "../exports/roo-code"
9+
import { ClineMessage, ClineAsk, ClineSay } from "../exports/roo-code"
1010
import { CheckpointStorage } from "./checkpoints"
1111
import { TelemetrySetting } from "./TelemetrySetting"
1212

@@ -158,7 +158,7 @@ export interface ExtensionState {
158158
showRooIgnoredFiles: boolean // Whether to show .rooignore'd files in listings
159159
}
160160

161-
export type { ClineMessage }
161+
export type { ClineMessage, ClineAsk, ClineSay }
162162

163163
export interface ClineSayTool {
164164
tool:

webview-ui/src/components/chat/ChatTextArea/ChatTextArea.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ interface ChatTextAreaProps {
2020
onHeightChange?: (height: number) => void
2121
mode: Mode
2222
setMode: (value: Mode) => void
23+
modeShortcutText: string
2324
}
2425

2526
const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
@@ -37,6 +38,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
3738
onHeightChange,
3839
mode,
3940
setMode,
41+
modeShortcutText,
4042
},
4143
ref,
4244
) => {
@@ -56,7 +58,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
5658
return () => document.removeEventListener("mousedown", handleClickOutside)
5759
}, [showDropdown])
5860

59-
6061
// Handle enhanced prompt response
6162
useEffect(() => {
6263
const messageHandler = (event: MessageEvent) => {
@@ -111,6 +112,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
111112
currentApiConfigName={currentApiConfigName}
112113
listApiConfigMeta={listApiConfigMeta}
113114
customModes={customModes}
115+
modeShortcutText={modeShortcutText}
114116
/>
115117
),
116118
actions: (

webview-ui/src/components/chat/ChatView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useDeepCompareEffect, useEvent, useMount } from "react-use"
55
import { Virtuoso, type VirtuosoHandle } from "react-virtuoso"
66
import styled from "styled-components"
77
import {
8+
ClineAsk,
89
ClineMessage,
910
ClineSayBrowserAction,
1011
ClineSayTool,
@@ -29,7 +30,6 @@ import { AudioType } from "../../../../src/shared/WebviewMessage"
2930
import { validateCommand } from "../../utils/command-validation"
3031
import { getAllModes } from "../../../../src/shared/modes"
3132
import TelemetryBanner from "../common/TelemetryBanner"
32-
import { ClineAsk } from "../../../../src/exports/roo-code"
3333

3434
interface ChatViewProps {
3535
isHidden: boolean

webview-ui/src/components/ui/select-dropdown.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
7777
}
7878

7979
return (
80-
<div
81-
className="relative inline-block min-w-0 flex-[0_1_auto]" // Select container styles
82-
>
80+
<div className="relative inline-block min-w-0 flex-[0_1_auto]">
8381
<DropdownMenu open={open} onOpenChange={setOpen}>
8482
<DropdownMenuTrigger
8583
ref={ref}
@@ -95,14 +93,12 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
9593
triggerClassName,
9694
)}
9795
style={{
98-
width: "100%", // Take full width of parent.
96+
width: "100%",
9997
minWidth: "0",
10098
maxWidth: "100%",
10199
}}>
102100
{shouldShowCaret && (
103-
<div
104-
className="pointer-events-none opacity-60 text-[10px]" // Caret container styles
105-
>
101+
<div className="pointer-events-none opacity-60 text-[10px]">
106102
<svg
107103
fill="none"
108104
height="10"

webview-ui/src/context/ExtensionStateContext.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import {
66
ExtensionMessage,
77
ExtensionState,
88
} from "../../../src/shared/ExtensionMessage"
9-
import { ApiConfiguration, ModelInfo } from "../../../src/shared/api"
10-
import { vscode } from "../utils/vscode"
11-
import { convertTextMateToHljs } from "../utils/textMateToHljs"
9+
import { ApiConfiguration } from "../../../src/shared/api"
1210
import { findLastIndex } from "../../../src/shared/array"
1311
import { McpServer } from "../../../src/shared/mcp"
1412
import { checkExistKey } from "../../../src/shared/checkExistApiConfig"
@@ -17,6 +15,9 @@ import { CustomSupportPrompts } from "../../../src/shared/support-prompt"
1715
import { ExperimentId } from "../../../src/shared/experiments"
1816
import { TelemetrySetting } from "../../../src/shared/TelemetrySetting"
1917

18+
import { vscode } from "@/utils/vscode"
19+
import { convertTextMateToHljs } from "@/utils/textMateToHljs"
20+
2021
export interface ExtensionStateContextType extends ExtensionState {
2122
didHydrateState: boolean
2223
showWelcome: boolean

0 commit comments

Comments
 (0)