Indent whole file

Author: pedrooaugusto

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

@@ -7,9 +7,13 @@ async function main() {
 
     Editor.turnOn()
     await wait(2000)
+
     const info = await Editor.fileInfo()
 
-    await Editor.writeOnTerminal('node "' + info.fileName + '"')
+    await Editor.write('hello doc')
+    await Editor.indentSelection()
+
+    // await Editor.writeOnTerminal('node "' + info.fileName + '"')
     // await Editor.newLine(1)
     // console.log(await Editor.moveCursorTo('END_LINE'))
     // console.log(await Editor.moveCursorTo(null, undefined, 6))

spoken-vscode-driver/.eslintrc.json

@@ -10,9 +10,9 @@
     ],
     "rules": {
         "@typescript-eslint/naming-convention": "warn",
-        "@typescript-eslint/semi": "warn",
-        "curly": "warn",
-        "eqeqeq": "warn",
+        "@typescript-eslint/semi": "off",
+        "curly": "off",
+        "eqeqeq": "off",
         "no-throw-literal": "warn",
         "semi": "off"
     }

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

@@ -169,7 +169,7 @@ class RobotVscode implements Robot {
 
         if (editor == null) return rej(e)
 
-        function MoveCursor(options: any) {
+        function moveCursor(options: any) {
             if (options.value === 0) return res()
 
             return vscode.commands.executeCommand('cursorMove', options).then(() => res())
@@ -180,12 +180,12 @@ class RobotVscode implements Robot {
         if (to === 'BEGIN_LINE' || to === 'END_LINE') {
             const { relative } = this.lineBoundaries(currentLine)
 
-            return MoveCursor({ to: relative[ to === 'BEGIN_LINE' ? 0 : 1 ] })
+            return moveCursor({ to: relative[ to === 'BEGIN_LINE' ? 0 : 1 ] })
         }
 
         // Move the cursor {leapSize} units to the right
         if (to === null) {
-            return MoveCursor({ to: 'right', value: leapSize, by: 'character' })
+            return moveCursor({ to: 'right', value: leapSize, by: 'character' })
         }
 
         if (to === 'SYMBOL' && symbol != undefined) {
@@ -200,7 +200,7 @@ class RobotVscode implements Robot {
 
             if (range == null) return rej('Match not found for symbol: ' + symbol)
 
-            return MoveCursor({ to: 'right', value: range[0], by: 'character' })
+            return moveCursor({ to: 'right', value: range[0], by: 'character' })
         }
 
         return rej(new Error('Unknown operation!'))
@@ -303,14 +303,20 @@ class RobotVscode implements Robot {
      * @param p2 Finish string[] (line, cursor)
      */
     indentSelection = (
-        p1: [string, string],
-        p2: [string, string]
+        p1?: [string, string],
+        p2?: [string, string]
     ) => new Promise<void | Error>((res, rej) => {
         try {
             const editor = vscode.window.activeTextEditor
 
             if (editor == null) return rej(new Error('No active text editor'))
 
+            if (p1 == null || p2 == null) {
+                return vscode.commands.executeCommand('editor.action.formatDocument', {}).then(a => {
+                    res()
+                })
+            }
+
             p1[0] = p1[0] ?? editor.selection.active.line
             p2[0] = p2[0] ?? editor.selection.active.line
 

spoken-vscode-driver/src/robot-vscode.ts

@@ -21,7 +21,9 @@ Math.max(5)
 // 1. More info on extension (v)
 // 2. More info on client (v)
 // 3. Add help section (v)
-// 3. write on blank file
+// 3. write on blank file (v)
+// 3. Indent whole file (v)
+// 3. remover linha
 // 4. Add button above mic informing lang and recording (v)
 // 5. escreva: letras
 // 5. escreva: . [ ] ( ) ? : ,

spoken/playground.js

@@ -12,7 +12,7 @@ async function Condition(command: ConditionParsedArgs, editor: Editor, context:
     const line = await editor.getLine() as { _line: number }
 
     await editor.write(text)
-    await editor.indentSelection([line._line - 3, 0], [line._line + (otherwise ? 8 : 3), 0])
+    await editor.indentSelection()
     await editor.goToLine(line._line as any)
 
     return null

spoken/src/modules/typescript/condition/impl.ts

@@ -26,7 +26,7 @@ async function FunctionCall(command: FunctionCallParsedArgs, editor: Editor, con
 
     await editor.write(text)
 
-    return await editor.indentSelection([line._line - 1, 0], [line._line - 1, line.character])
+    return await editor.indentSelection()
 }
 
 const toArray = (arg: any | any[]) => Array.isArray(arg) ? arg : [arg]

spoken/src/modules/typescript/function_call/impl.ts

@@ -27,7 +27,7 @@ async function FunctionDeclaration(command: FunctionDeclarationParsedArgs, edito
 
     await editor.write(text)
 
-    await editor.indentSelection([line._line - 3, 0], [line._line + 3, 0])
+    await editor.indentSelection()
 
     return await editor.goToLine(line._line as any)
 }

spoken/src/modules/typescript/function_declaration/impl.ts

@@ -23,7 +23,7 @@ async function Repetition(command: RepetitionParsedArgs, editor: Editor, context
     const line = await editor.getLine() as { _line: number }
 
     await editor.write(text)
-    await editor.indentSelection([line._line - 3, 0], [line._line + 3, 0])
+    await editor.indentSelection()
 
     return await editor.goToLine(line._line as any)
 }

spoken/src/modules/typescript/repetition/impl.ts

@@ -2,5 +2,6 @@
     "trailingComma":"none",
     "tabWidth": 4,
     "semi": false,
-    "singleQuote": true
+    "singleQuote": true,
+    "useTabs": true
 }