Applies nph format to src files (#106)

Author: jmgomez

nimvscode.nimble

@@ -1,21 +1,21 @@
 # Package
 
-version     = "1.2.0"
-author      = "saem"
+version = "1.2.0"
+author = "saem"
 description = "Nim language support for Visual Studio Code written in Nim"
-license     = "MIT"
-backend     = "js"
-srcDir      = "src"
-binDir      = "out"
-bin         = @["nimvscode"]
+license = "MIT"
+backend = "js"
+srcDir = "src"
+binDir = "out"
+bin = @["nimvscode"]
 
 # Deps
 
 requires "nim >= 2.0.0 & <= 2.1"
 
 import std/os
 
-proc initialNpmInstall =
+proc initialNpmInstall() =
   if not dirExists "node_modules":
     exec "npm install"
 
@@ -27,7 +27,7 @@ task release, "This compiles a release version":
   exec "nim js -d:release -d:danger --outdir:out --checks:off --sourceMap src/nimvscode.nim"
 
 task vsix, "Build VSIX package":
-  initialNpmInstall()  
+  initialNpmInstall()
   var cmd = "npm exec -c 'vsce package --out out/nimvscode-" & version & ".vsix'"
   when defined(windows):
     cmd = "powershell.exe " & cmd

src/nimDeclaration.nim

@@ -4,37 +4,34 @@ import platform/vscodeApi
 import nimSuggestExec
 
 proc provideDefinition*(
-  doc: VscodeTextDocument,
-  position: VscodePosition,
-  token: VscodeCancellationToken
+    doc: VscodeTextDocument, position: VscodePosition, token: VscodeCancellationToken
 ): Promise[Array[VscodeLocation]] =
   ## TODO - the return type is a sub-set of what's in the TypeScript API
   ## Since we're providing the result this isn't a practical problem
-  return newPromise(proc (
-    resolve: proc(val: Array[VscodeLocation]),
-    reject: proc(reason: JsObject)
-  ) =
-    let pos: cint = position.line + 1
-    execNimSuggest(
-      NimSuggestType.def,
-      doc.fileName,
-      pos,
-      position.character,
-      true,
-      doc.getText()
-    ).then(
-      proc(result: seq[NimSuggestResult]) =
-        if(not result.isNull() and not result.isUndefined() and result.len > 0):
-          let locations = newArray[VscodeLocation]()
-          for def in result:
-            if not(def.isUndefined() or def.isNull()):
-              locations.push def.location
+  return newPromise(
+    proc(resolve: proc(val: Array[VscodeLocation]), reject: proc(reason: JsObject)) =
+      let pos: cint = position.line + 1
 
-          if locations.len > 0:
-            resolve(locations)
+      execNimSuggest(
+        NimSuggestType.def, doc.fileName, pos, position.character, true, doc.getText()
+      )
+      .then(
+        proc(result: seq[NimSuggestResult]) =
+          if (not result.isNull() and not result.isUndefined() and result.len > 0):
+            let locations = newArray[VscodeLocation]()
+            for def in result:
+              if not (def.isUndefined() or def.isNull()):
+                locations.push def.location
 
-        resolve(jsNull.to(Array[VscodeLocation]))
-    ).catch(proc(reason: JsObject) = reject(reason))
+            if locations.len > 0:
+              resolve(locations)
+
+          resolve(jsNull.to(Array[VscodeLocation]))
+      )
+      .catch(
+        proc(reason: JsObject) =
+          reject(reason)
+      )
   )
 
 var nimDefinitionProvider* {.exportc.} = block:

src/nimFormatting.nim

@@ -13,26 +13,28 @@ from tools/nimBinTools import getNimPrettyExecPath
 var extensionContext*: VscodeExtensionContext
 
 proc provideDocumentFormattingEdits*(
-  doc: VscodeTextDocument,
-  options: VscodeFormattingOptions,
-  token: VscodeCancellationToken
+    doc: VscodeTextDocument,
+    options: VscodeFormattingOptions,
+    token: VscodeCancellationToken,
 ): Future[seq[VscodeTextEdit]] {.async.} =
   var ret: seq[VscodeTextEdit] = @[]
   if getNimPrettyExecPath() == "":
-    vscode.window.showInformationMessage("No 'nimpretty' binary could be found in PATH environment variable")
+    vscode.window.showInformationMessage(
+      "No 'nimpretty' binary could be found in PATH environment variable"
+    )
     return ret
 
   var file = getDirtyFile(doc)
   var config = vscode.workspace.getConfiguration("nim")
   var res = cp.spawnSync(
-      getNimPrettyExecPath(),
-      @[
-          cstring "--backup:OFF",
-          "--indent:" & cstring($(config.getInt("nimprettyIndent"))),
-          "--maxLineLen:" & cstring($(config.getInt("nimprettyMaxLineLen"))),
-          file
+    getNimPrettyExecPath(),
+    @[
+      cstring "--backup:OFF",
+      "--indent:" & cstring($(config.getInt("nimprettyIndent"))),
+      "--maxLineLen:" & cstring($(config.getInt("nimprettyMaxLineLen"))),
+      file,
     ],
-    SpawnSyncOptions{cwd: extensionContext.extensionPath}
+    SpawnSyncOptions{cwd: extensionContext.extensionPath},
   )
 
   if res.status != 0:
@@ -45,14 +47,13 @@ proc provideDocumentFormattingEdits*(
     return ret
 
   var content = fs.readFileSync(file, "utf-8")
-  var `range` = doc.validateRange(vscode.newRange(
-      vscode.newPosition(0, 0),
-      vscode.newPosition(1000000, 1000000))
+  var `range` = doc.validateRange(
+    vscode.newRange(vscode.newPosition(0, 0), vscode.newPosition(1000000, 1000000))
   )
   ret.add(vscode.textEditReplace(`range`, content))
   return ret
 
 var nimFormattingProvider* {.exportc.} = block:
-    var o = newJsObject()
-    o.provideDocumentFormattingEdits = provideDocumentFormattingEdits
-    o.to(VscodeDocumentFormattingEditProvider)
+  var o = newJsObject()
+  o.provideDocumentFormattingEdits = provideDocumentFormattingEdits
+  o.to(VscodeDocumentFormattingEditProvider)

src/nimHover.nim

@@ -6,42 +6,46 @@ import nimSuggestExec
 import nimMode
 
 proc provideHover*(
-  doc: VscodeTextDocument,
-  position: VscodePosition,
-  token: VscodeCancellationToken
+    doc: VscodeTextDocument, position: VscodePosition, token: VscodeCancellationToken
 ): Promise[VscodeHover] =
-  return newPromise(proc (
-    resolve: proc(val: VscodeHover),
-    reject: proc(reason: JsObject)
-  ) =
-    var pos: cint = position.line + 1
-    execNimSuggest(
-      NimSuggestType.def,
-      doc.fileName,
-      pos,
-      position.character,
-      true,
-      doc.getText()
-    ).then(proc(items: seq[NimSuggestResult]) =
-      if(not items.isNull() and not items.isUndefined() and items.len > 0):
-        var definition = items[items.len - 1]
-        var label = definition.fullName
+  return newPromise(
+    proc(resolve: proc(val: VscodeHover), reject: proc(reason: JsObject)) =
+      var pos: cint = position.line + 1
 
-        if definition.`type` != "":
-          label &= ": " & definition.`type`
-        var hoverLabel: VscodeMarkedString = VscodeHoverLabel{
-            language: mode.language, value: label}
+      execNimSuggest(
+        NimSuggestType.def, doc.fileName, pos, position.character, true, doc.getText()
+      )
+      .then(
+        proc(items: seq[NimSuggestResult]) =
+          if (not items.isNull() and not items.isUndefined() and items.len > 0):
+            var definition = items[items.len - 1]
+            var label = definition.fullName
 
-        if definition.documentation != "":
-          resolve(vscode.newVscodeHover(newArrayWith[VscodeMarkedString](hoverLabel, definition.documentation)))
-        else:
-          resolve(vscode.newVscodeHover(newArrayWith[VscodeMarkedString](hoverLabel)))
-      else:
-        resolve(jsUndefined.to(VscodeHover))
-    ).catch(proc(reason: JsObject) = reject(reason))
+            if definition.`type` != "":
+              label &= ": " & definition.`type`
+            var hoverLabel: VscodeMarkedString =
+              VscodeHoverLabel{language: mode.language, value: label}
+
+            if definition.documentation != "":
+              resolve(
+                vscode.newVscodeHover(
+                  newArrayWith[VscodeMarkedString](hoverLabel, definition.documentation)
+                )
+              )
+            else:
+              resolve(
+                vscode.newVscodeHover(newArrayWith[VscodeMarkedString](hoverLabel))
+              )
+          else:
+            resolve(jsUndefined.to(VscodeHover))
+      )
+      .catch(
+        proc(reason: JsObject) =
+          reject(reason)
+      )
   )
 
 var nimHoverProvider* {.exportc.} = block:
-    var o = newJsObject()
-    o.provideHover = provideHover
-    o.to(VscodeHoverProvider)
+  var o = newJsObject()
+  o.provideHover = provideHover
+  o.to(VscodeHoverProvider)