@@ -91,25 +91,19 @@ function inputChanged(state: PromptInputV2InteractionState, value: string, persi
9191 const context = value . match ( / (?: ^ | \s ) @ ( [ ^ \s @ ] * ) $ / )
9292 if ( context ) {
9393 const query = context [ 1 ] ?? ""
94- return changed (
95- { ...state , popover : { type : "context" , query } , focus : "editor" } ,
96- [
97- ...setText ,
98- { type : "popover.filter" , popover : "context" , query } ,
99- ] ,
100- )
94+ return changed ( { ...state , popover : { type : "context" , query } , focus : "editor" } , [
95+ ...setText ,
96+ { type : "popover.filter" , popover : "context" , query } ,
97+ ] )
10198 }
10299
103100 const command = value . match ( / ^ \/ ( [ ^ \s / ] * ) $ / )
104101 if ( command ) {
105102 const query = command [ 1 ] ?? ""
106- return changed (
107- { ...state , popover : { type : "command-inline" , query } , focus : "editor" } ,
108- [
109- ...setText ,
110- { type : "popover.filter" , popover : "command" , query } ,
111- ] ,
112- )
103+ return changed ( { ...state , popover : { type : "command-inline" , query } , focus : "editor" } , [
104+ ...setText ,
105+ { type : "popover.filter" , popover : "command" , query } ,
106+ ] )
113107 }
114108
115109 return changed (
@@ -123,45 +117,35 @@ function openCommands(
123117 persisted : PromptInputV2PersistedState ,
124118) : PromptInputV2Transition {
125119 if ( ! populated ( persisted ) ) {
126- return changed (
127- { ...state , popover : { type : "command-inline" , query : "" } , focus : "editor" } ,
128- [
129- { type : "draft.setText" , value : promptText ( persisted ) + "/" } ,
130- { type : "popover.filter" , popover : "command" , query : "" } ,
131- { type : "focus.editor" } ,
132- ] ,
133- )
134- }
135- return changed (
136- { ...state , popover : { type : "command-menu" , query : "" } , focus : "command-search" } ,
137- [
120+ return changed ( { ...state , popover : { type : "command-inline" , query : "" } , focus : "editor" } , [
121+ { type : "draft.setText" , value : promptText ( persisted ) + "/" } ,
138122 { type : "popover.filter" , popover : "command" , query : "" } ,
139- { type : "focus.command-search" } ,
140- ] ,
141- )
123+ { type : "focus.editor" } ,
124+ ] )
125+ }
126+ return changed ( { ...state , popover : { type : "command-menu" , query : "" } , focus : "command-search" } , [
127+ { type : "popover.filter" , popover : "command" , query : "" } ,
128+ { type : "focus.command-search" } ,
129+ ] )
142130}
143131
144132function openContext (
145133 state : PromptInputV2InteractionState ,
146134 persisted : PromptInputV2PersistedState ,
147135) : PromptInputV2Transition {
148- return changed (
149- { ...state , popover : { type : "context" , query : "" } , focus : "editor" } ,
150- [
151- { type : "draft.setText" , value : promptText ( persisted ) + "@" } ,
152- { type : "popover.filter" , popover : "context" , query : "" } ,
153- { type : "focus.editor" } ,
154- ] ,
155- )
136+ return changed ( { ...state , popover : { type : "context" , query : "" } , focus : "editor" } , [
137+ { type : "draft.setText" , value : promptText ( persisted ) + "@" } ,
138+ { type : "popover.filter" , popover : "context" , query : "" } ,
139+ { type : "focus.editor" } ,
140+ ] )
156141}
157142
158143function queryChanged ( state : PromptInputV2InteractionState , query : string ) : PromptInputV2Transition {
159144 if ( state . popover . type === "closed" ) return unchanged ( state )
160145 const popover = state . popover . type === "context" ? "context" : "command"
161- return changed (
162- { ...state , popover : { ...state . popover , query, activeID : undefined } } ,
163- [ { type : "popover.filter" , popover, query } ] ,
164- )
146+ return changed ( { ...state , popover : { ...state . popover , query, activeID : undefined } } , [
147+ { type : "popover.filter" , popover, query } ,
148+ ] )
165149}
166150
167151function resultsChanged ( state : PromptInputV2InteractionState , ids : string [ ] ) : PromptInputV2Transition {
@@ -215,20 +199,26 @@ function keyDown(
215199 return unchanged ( state )
216200 }
217201 if ( event . key === "Escape" ) {
218- return changed (
219- { ...state , popover : { type : "closed" } , focus : "editor" } ,
220- [ { type : "focus.editor" } ] ,
221- true ,
222- )
202+ return changed ( { ...state , popover : { type : "closed" } , focus : "editor" } , [ { type : "focus.editor" } ] , true )
223203 }
224204 if ( event . key === "Tab" || ( event . key === "Enter" && ! event . composing ) ) {
225205 if ( ! state . popover . activeID ) return unchanged ( state , true )
226206 return unchanged ( state , true , [ { type : "suggestion.select" , id : state . popover . activeID } ] )
227207 }
228- const direction = event . key === "ArrowDown" || ( event . ctrl && event . key === "n" ) ? 1 : event . key === "ArrowUp" || ( event . ctrl && event . key === "p" ) ? - 1 : 0
208+ const direction =
209+ event . key === "ArrowDown" || ( event . ctrl && event . key === "n" )
210+ ? 1
211+ : event . key === "ArrowUp" || ( event . ctrl && event . key === "p" )
212+ ? - 1
213+ : 0
229214 if ( ! direction || event . ids . length === 0 ) return unchanged ( state )
230215 const current = state . popover . activeID ? event . ids . indexOf ( state . popover . activeID ) : - 1
231- const index = current < 0 ? ( direction === 1 ? 0 : event . ids . length - 1 ) : ( current + direction + event . ids . length ) % event . ids . length
216+ const index =
217+ current < 0
218+ ? direction === 1
219+ ? 0
220+ : event . ids . length - 1
221+ : ( current + direction + event . ids . length ) % event . ids . length
232222 return changed ( { ...state , popover : { ...state . popover , activeID : event . ids [ index ] } } , [ ] , true )
233223}
234224
0 commit comments