Skip to content

Commit 14683cc

Browse files
committed
Cleanup and release
1 parent 1e5a257 commit 14683cc

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.changeset/blue-masks-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Add shortcuts to the currently open tabs in the "Add File" section of @-mentions (thanks @olup!)

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
8989
return () => window.removeEventListener("message", messageHandler)
9090
}, [setInputValue])
9191

92-
const [isTextAreaFocused, setIsTextAreaFocused] = useState(false)
9392
const [thumbnailsHeight, setThumbnailsHeight] = useState(0)
9493
const [textAreaBaseHeight, setTextAreaBaseHeight] = useState<number | undefined>(undefined)
9594
const [showContextMenu, setShowContextMenu] = useState(false)
@@ -136,18 +135,15 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
136135
}, [inputValue, textAreaDisabled, setInputValue])
137136

138137
const queryItems = useMemo(() => {
139-
const items = [
138+
return [
140139
{ type: ContextMenuOptionType.Problems, value: "problems" },
141140
...gitCommits,
142-
// Add opened tabs
143141
...openedTabs
144142
.filter((tab) => tab.path)
145143
.map((tab) => ({
146144
type: ContextMenuOptionType.OpenedFile,
147145
value: "/" + tab.path,
148146
})),
149-
150-
// Add regular file paths
151147
...filePaths
152148
.map((file) => "/" + file)
153149
.filter((path) => !openedTabs.some((tab) => tab.path && "/" + tab.path === path)) // Filter out paths that are already in openedTabs
@@ -156,9 +152,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
156152
value: path,
157153
})),
158154
]
159-
160-
return items
161-
}, [filePaths, openedTabs])
155+
}, [filePaths, gitCommits, openedTabs])
162156

163157
useEffect(() => {
164158
const handleClickOutside = (event: MouseEvent) => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
102102
const getIconForOption = (option: ContextMenuQueryItem): string => {
103103
switch (option.type) {
104104
case ContextMenuOptionType.OpenedFile:
105-
return "star-full"
105+
return "window"
106106
case ContextMenuOptionType.File:
107107
return "file"
108108
case ContextMenuOptionType.Folder:

webview-ui/src/utils/context-mentions.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,6 @@ export function getContextMenuOptions(
132132
}
133133
if (query.startsWith("http")) {
134134
suggestions.push({ type: ContextMenuOptionType.URL, value: query })
135-
} else {
136-
suggestions.push(
137-
...queryItems
138-
.filter((item) => item.type !== ContextMenuOptionType.OpenedFile)
139-
.filter((item) => item.value?.toLowerCase().includes(lowerQuery)),
140-
)
141135
}
142136

143137
// Add exact SHA matches to suggestions
@@ -175,12 +169,16 @@ export function getContextMenuOptions(
175169

176170
// Separate matches by type
177171
const fileMatches = matchingItems.filter(
178-
(item) => item.type === ContextMenuOptionType.File || item.type === ContextMenuOptionType.Folder,
172+
(item) =>
173+
item.type === ContextMenuOptionType.File ||
174+
item.type === ContextMenuOptionType.OpenedFile ||
175+
item.type === ContextMenuOptionType.Folder,
179176
)
180177
const gitMatches = matchingItems.filter((item) => item.type === ContextMenuOptionType.Git)
181178
const otherMatches = matchingItems.filter(
182179
(item) =>
183180
item.type !== ContextMenuOptionType.File &&
181+
item.type !== ContextMenuOptionType.OpenedFile &&
184182
item.type !== ContextMenuOptionType.Folder &&
185183
item.type !== ContextMenuOptionType.Git,
186184
)

0 commit comments

Comments
 (0)