some bugfix new commands and prepare to close

Author: pedrooaugusto

client/package-lock.json

@@ -54,4 +54,4 @@
 		"electron": "11.2.3",
 		"electron-builder": "22.10.5"
 	}
-}
+}

client/package.json

@@ -1,10 +1,9 @@
-/* PLAYGROUND REGION - THIS REGION OF THE FILE WILL
-BE ALTERED BY THE THIS TEST.
 
 
 
 
-*/
+
+
 
 import Spoken, { SpokenCommand } from 'spoken'
 import { IpcMainEvent } from 'electron'
@@ -34,7 +33,7 @@ async function Main() {
         await conditionTest()
         await repetitionTest()
         await newFunctionTest()
-    } catch(err) {
+    } catch (err) {
         console.log(err.toString())
     } finally {
         EditorService.stop()
@@ -82,7 +81,7 @@ async function conditionTest() {
     await execute('new line')
 }
 
-async function executeFunctionTest()  {
+async function executeFunctionTest() {
     await wait(1000)
     await execute('go to line 4')
     await execute('execute a função bola da string hello string com 3 argumentos', 'pt-BR')

client/src/__tests__/spoken-interface.test.ts

@@ -10,8 +10,7 @@ async function main() {
 
     const info = await Editor.fileInfo()
 
-    await Editor.write('hello doc')
-    await Editor.indentSelection()
+    await Editor.remove(4)
 
     // await Editor.writeOnTerminal('node "' + info.fileName + '"')
     // await Editor.newLine(1)

client/src/editors/vscode/index.test.js

@@ -190,6 +190,16 @@ class VSCodeEditor extends Editor {
         })
     }
 
+    remove(selection: number | [[number, number], [number, number]]) {
+        console.log('[client.VSCodeRobot.getLine]: Sending request to execute remove(...)')
+
+        return this.runTask({
+            type: 'remove',
+            context: {},
+            extra: { args: [selection] }
+        })
+    }
+
     indentSelection(p1: [string, string], p2: [string, string]): Promise<void | Error> {
         console.log('[client.VSCodeRobot.indentSelection]: Sending request to execute indentSelection(...)')
         const task = {

client/src/editors/vscode/index.ts

@@ -8,39 +8,7 @@ export function activate(context: vscode.ExtensionContext) {
 	Log('Spoken VSCode driver is ready!')
 
 	let disposable = vscode.commands.registerCommand('spoken.helloWorld', async () => {
-		vscode.window.showInformationMessage('Hello World from VSCode Spoken!')
-
-		// editor.selection = new vscode.Selection(14, 0, 14, 52)
-		// vscode.commands.executeCommand('editor.action.reindentselectedlines', {})
-
-		// vscode.commands.executeCommand('editor.action.insertLineBefore', {})
-		/*const destLine = 55
-		
-		const line = (editor?.selection?.active?.line || 0) + 1
-		const to = destLine > line ? 'down' : 'up'
-		const value = to === 'down' ? destLine - line : line - destLine
-		
-		vscode.commands.executeCommand('cursorMove', { to, value, by: 'line' }).then(() => {
-			vscode.commands.executeCommand('revealLine', { lineNumber: destLine, at: 'center' }).then(() => {
-				vscode.commands.executeCommand('cursorMove', { to: 'wrappedLineFirstNonWhitespaceCharacter' })
-			})
-		})*/
-		
-		// vscode.commands.executeCommand('cursorMove', { to, value, by: 'line' })
-		
-		/*vscode.commands.executeCommand('cursorMove', {
-			to: 'viewPortTop',
-			by: 'line',
-			value: 3
-		})*/
-		// vscode.commands.executeCommand('revealLine', { lineNumber: 2 })
-		// let a = await vscode.commands.getCommands()
-		// Log(a)
-		// const editor = vscode.window.activeTextEditor
-		
-		// editor?.edit((editBuilder) => {
-		// 	editBuilder.insert(editor.selection.active, 'hello42')
-		// })\
+		vscode.window.showInformationMessage('Hello World from VSCode!')
 	})
 
 	context.subscriptions.push(disposable)

client/src/resources/speech2code-0.0.1-alpha.3.vsix

@@ -12,11 +12,87 @@ export type TaskRequest = {
 }
 
 export interface Robot {
+    /**
+	 * Writes something in the current text input (editor).
+     * 
+	 * @param text The text to be written
+	 */
     write(text: string): Promise<void | Error>
-	removeSelection(): Promise<string | Error>
-	newLine(pos: 0 | 1): Promise<void | Error>
-	removeLine(): Promise<string | Error>
-	selectLines(from: number | undefined, to: number | undefined): Promise<string | Error>
-	goToLine(number: string): Promise<string | Error>
-    hotKey(...keys: string[]): Promise<void | Error>
+
+    /**
+     * Creates a new line above or below the current line.
+     * 
+     * @returns undefined if evrything went well, error otherwise
+     */
+    newLine(pos: 0 | 1): Promise<void | Error>
+
+    /**
+     * Moves the cursor to a different line.
+     * 
+     * @param number Line number
+     * @param string Line position (END, BEGIN)
+     */
+    goToLine(number: string, cursorPosition: 'END' | 'BEGIN'): Promise<string | Error>
+
+    /**
+     * Finds the position of a given token in the current line.
+     * 
+     * @param to {string} Where the cursor should move to
+     * @param symbol {string} If `to` is SYMBOL, which symbol are we looking for
+     * @param leapSize {number} How many matches should be skiped
+     */
+    moveCursorTo(
+        to: 'END_LINE' | 'BEGIN_LINE' | 'SYMBOL' | null,
+        symbol: string | undefined,
+        leapSize: number | undefined
+    ): Promise<void | Error>
+
+    /**
+     * Finds the range of a term in a given line
+     * 
+     * @param term {RegExp | string} What we are looking for
+     * @param line {number} Which line to look for
+     */
+    findPositionOf(term: RegExp | string, line?: number, pad?: number): Promise<number[][] | Error>
+
+    /**
+     * Selects a piece of text in the editor.
+     * 
+     * @param from Where to start the selection
+     * @param to Where to stop the selection
+     * @param line If its a line selection or a word selection
+     * @returns The text selection
+     */
+    select(from: number, to: number, line: boolean): Promise<string | Error>
+
+    /**
+     * Retrieves the content of the provided line.
+     * 
+     * @param number | undefined line number
+     */
+    getLine(number?: number): Promise<{ lineNumber: number, text: string, _text: string, _line: number, character: number } | Error>
+
+    /**
+     * Indents the provided selection or the whole file if no selection is provided.
+     *
+     * @param p1 Start string[] (line, cursor)
+     * @param p2 Finish string[] (line, cursor)
+     */
+    indentSelection(p1?: [string, string], p2?: [string, string]): Promise<void | Error>
+
+    /**
+     * Writes something in the terminal and press enter.
+     * 
+     * @param text Text to be written in the terminal
+     * @returns void
+     */
+    writeOnTerminal(text: string): Promise<void | Error>
+
+    /**
+     * Retrieves information about a file
+     * 
+     * @param text Which file we are looking for information about, if undefined current file.
+     * @returns 
+     */
+    fileInfo(text?: string): Promise<Record<string, any> | Error>
 }

spoken-vscode-driver/speech2code-0.0.1-alpha.3.vsix

@@ -2,7 +2,6 @@ import * as vscode from './vscode'
 import { Robot } from './index'
 import Log from './logger'
 
-// @TODO: Replace everything 'robot' for editor
 class RobotVscode implements Robot {
 
     private getEditor(): [vscode.TextEditor | null, Error | null] {
@@ -33,12 +32,23 @@ class RobotVscode implements Robot {
         })
     })
 
-    removeSelection(): Promise<string | Error> {
-        throw new Error('Method not implemented.')
-    }
+    /**
+	 * Removes the provided selection/line
+     * 
+	 * @param The line to be removed
+	 */
+     remove = (selection: number | [[number, number], [number, number]]) => new Promise<void | Error>((res, rej) => {
+        Log('[vscode-driver.robot-vscode.write]: Executing remove(' + selection + ')')
+
+        const [editor, e] = this.getEditor()
+
+        if (editor == null) return rej(e)
+
+        vscode.commands.executeCommand('editor.action.deleteLines').then(() => res())
+    })
 
     /**
-     * Creates a new line above the current line.
+     * Creates a new line above or below the current line.
      * 
      * @returns undefined if evrything went well, error otherwise
      */
@@ -61,17 +71,11 @@ class RobotVscode implements Robot {
         })
     })
 
-    removeLine(): Promise<string | Error> {
-        throw new Error('Method not implemented.')
-    }
-
-    selectLines(from: number | undefined, to: number | undefined): Promise<string | Error> {
-        throw new Error('Method not implemented.')
-    }
-
     /**
      * Moves the cursor to a different line
+     * 
      * @param number Line number
+     * @param string Line position (END, BEGIN)
      */
     goToLine = (
         number: string,
@@ -95,25 +99,21 @@ class RobotVscode implements Robot {
 
             vscode.commands.executeCommand('cursorMove', { to, value, by: 'line' }).then(() => {
                 vscode.commands.executeCommand('revealLine', { lineNumber: destLine, at: 'center' }).then(() => {
-                    // const t = `wrappedLine${cursorPosition === 'BEGIN' ? 'First' : 'Last'}NonWhitespaceCharacter`
                     const text = editor.document.lineAt(destLine - 1).text
+
+                    if (cursorPosition === 'END') {
+                        return vscode.commands.executeCommand('cursorMove', { to: 'wrappedLineEnd'}).then(() => res(text))
+                    }
+
                     const index = text.length - text.trimLeft().length
+
                     vscode.commands.executeCommand('cursorMove', { to: 'wrappedLineStart'}).then(() => {
-                        if (index <= 0) {
-                            res(text)
-                        } else {
-                            vscode.commands.executeCommand('cursorMove', { to: 'right', value: index, by: 'character' }).then(() => {
-                                res(text)
-                            })
-                        }
+                        if (index <= 0) return res(text)
+
+                        vscode.commands.executeCommand('cursorMove', { to: 'right', value: index, by: 'character' }).then(() => res(text))
                     })
                 })
             })
-
-            // const { range, text } = editor.document.lineAt(parseInt(number) - 1)
-            // editor.selection = new vscode.Selection(range.start, range.end)
-
-            // editor.revealRange(range)
         } catch(err) {
             rej(err)
         }
@@ -262,10 +262,6 @@ class RobotVscode implements Robot {
         }
     })
 
-    hotKey(...keys: string[]): Promise<void | Error> {
-        throw new Error('Method not implemented.')
-    }
-
     /**
      * Retrieves the content of the provided line
      * 
@@ -278,7 +274,7 @@ class RobotVscode implements Robot {
 
             if (editor == null) throw e
 
-            number = number != null ? number : editor.selection.active.line + 1
+            number = number != null ? number : editor.selection.active.line
 
             const d = editor.document.lineAt(number)
             return {