Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 07:08:10 +00:00
Code Issues Projects Releases Wiki Activity

fix bug related to tab completion

Browse Source
This commit is contained in:
zokutyou2@gmail.com 2021-07-15 19:56:49 +09:00
parent 689fde87a2
commit 4ab49c5239
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/js/components/CommandBar.tsx
View File

@ -27,7 +27,7 @@ export function CommandHelp({nextArgs, currentArg, help, description, availableC
<div className="arrow"/> <div className="arrow"/>
<div className="popover-content"> <div className="popover-content">
{ results.length > 0 && <div><strong>Argument suggestion:</strong> {results}</div> } { results.length > 0 && <div><strong>Argument suggestion:</strong> {results}</div> }
{ help.includes("->") && <div><strong>Signature help: </strong>{help}</div>} { help?.includes("->") && <div><strong>Signature help: </strong>{help}</div>}
{ description && <div># {description}</div>} { description && <div># {description}</div>}
<div><strong>Available Commands: </strong><p className="available-commands">{JSON.stringify(availableCommands)}</p></div> <div><strong>Available Commands: </strong><p className="available-commands">{JSON.stringify(availableCommands)}</p></div>
</div> </div>
@ -38,6 +38,7 @@ export default function CommandBar() {
const [input, setInput] = useState("") const [input, setInput] = useState("")
const [originalInput, setOriginalInput] = useState("") const [originalInput, setOriginalInput] = useState("")
const [currentCompletion, setCurrentCompletion] = useState(0) const [currentCompletion, setCurrentCompletion] = useState(0)
const [completionCandidate, setCompletionCandidate] = useState([])
const [availableCommands, setAvailableCommands] = useState([]) const [availableCommands, setAvailableCommands] = useState([])
const [allCommands, setAllCommands] = useState({}) const [allCommands, setAllCommands] = useState({})
@ -54,7 +55,8 @@ export default function CommandBar() {
fetchApi('/commands', { method: 'GET' }) fetchApi('/commands', { method: 'GET' })
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
setAllCommands(data) setAllCommands(data["commands"])
setCompletionCandidate(getAvailableCommands(data["commands"]))
setAvailableCommands(getAvailableCommands(data["commands"])) setAvailableCommands(getAvailableCommands(data["commands"]))
}) })
}, []) }, [])
@ -62,14 +64,14 @@ export default function CommandBar() {
const parseCommand = (originalInput, input) => { const parseCommand = (originalInput, input) => {
const parts = Filt.parse(input) const parts = Filt.parse(input)
const originalParts = Filt.parse(originalInput) const originalParts = Filt.parse(originalInput)
const commands = allCommands["commands"]
setSignatureHelp(commands[parts[0]]?.signature_help) setSignatureHelp(allCommands[parts[0]]?.signature_help)
setDescription(commands[parts[0]]?.description) setDescription(allCommands[parts[0]]?.description)
setAvailableCommands(getAvailableCommands(commands, originalParts[0])) setCompletionCandidate(getAvailableCommands(allCommands, originalParts[0]))
setAvailableCommands(getAvailableCommands(allCommands, parts[0]))
const nextArgs = allCommands["commands"][parts[0]]?.args const nextArgs = allCommands[parts[0]]?.args
if (nextArgs) { if (nextArgs) {
setNextArgs([parts[0], ...nextArgs]) setNextArgs([parts[0], ...nextArgs])
@ -80,6 +82,7 @@ export default function CommandBar() {
const onChange = (e) => { const onChange = (e) => {
setInput(e.target.value) setInput(e.target.value)
setOriginalInput(e.target.value) setOriginalInput(e.target.value)
setCurrentCompletion(0)
} }
const onKeyDown = (e) => { const onKeyDown = (e) => {
@ -110,6 +113,8 @@ export default function CommandBar() {
setInput("") setInput("")
setOriginalInput("") setOriginalInput("")
setCompletionCandidate(availableCommands)
} }
if (e.keyCode === Key.UP) { if (e.keyCode === Key.UP) {
if (currentPos > 0) { if (currentPos > 0) {
@ -126,15 +131,14 @@ export default function CommandBar() {
} }
} }
if (e.keyCode === Key.TAB) { if (e.keyCode === Key.TAB) {
setInput(availableCommands[currentCompletion]) setInput(completionCandidate[currentCompletion])
setCurrentCompletion((currentCompletion + 1) % availableCommands.length) setCurrentCompletion((currentCompletion + 1) % completionCandidate.length)
e.preventDefault() e.preventDefault()
} }
e.stopPropagation() e.stopPropagation()
} }
const onKeyUp = (e) => { const onKeyUp = (e) => {
if (input == "") return
parseCommand(originalInput, input) parseCommand(originalInput, input)
e.stopPropagation() e.stopPropagation()
} }