Update for 2.0

Author: zyedidia

README.md

@@ -1,8 +1,10 @@
 # Go Plugin for Micro
 
-This repository holds the Go plugin for micro.
+This repository holds the Go plugin for micro. This plugin
+has been updated for use with micro 2.0.
 
-Install with `> plugin install go`. This plugin will let you
-automatically run `gofmt` and `goimports` from within micro.
+Install by cloning this into your plug directory:
 
-Use `> gorename newName` or F6 to use gorename.
+```
+git clone https://github.com/micro-editor/go-plugin ~/.config/micro/plug
+```

go.lua

@@ -1,90 +1,81 @@
-VERSION = "1.0.1"
+local micro = import("micro")
+local config = import("micro/config")
+local shell = import("micro/shell")
+local buffer = import("micro/buffer")
 
-if GetOption("goimports") == nil then
-    AddOption("goimports", false)
-end
-if GetOption("gofmt") == nil then
-    AddOption("gofmt", true)
-end
+function init()
+    config.RegisterCommonOption("goimports", false)
+    config.RegisterCommonOption("gofmt", true)
 
-MakeCommand("goimports", "go.goimports", 0)
-MakeCommand("gofmt", "go.gofmt", 0)
-MakeCommand("gorename", "go.gorename", 0)
+    config.MakeCommand("goimports", "go.goimports", config.NoComplete)
+    config.MakeCommand("gofmt", "go.gofmt", config.NoComplete)
+    config.MakeCommand("gorename", "go.gorename", config.NoComplete)
 
-function onViewOpen(view)
-    if view.Buf:FileType() == "go" then
-        SetLocalOption("tabstospaces", "off", view)
-    end
+    config.AddRuntimeFile("go-plugin", config.RTHelp, "help/go-plugin.md")
+    config.TryBindKey("F6", "command-edit:gorename ", false)
+    config.MakeCommand("gorename", "go.gorenameCmd", config.NoComplete)
 end
 
-function onSave(view)
-    if CurView().Buf:FileType() == "go" then
-        if GetOption("goimports") then
-            goimports()
-        elseif GetOption("gofmt") then
-            gofmt()
+function onSave(bp)
+    if bp.Buf:FileType() == "go" then
+        if bp.Buf.Settings["goimports"] then
+            goimports(bp)
+        elseif bp.Buf.Settings["gofmt"] then
+            gofmt(bp)
         end
     end
+    return false
 end
 
-function gofmt()
-    CurView():Save(false)
-    local handle = io.popen("gofmt -w " .. CurView().Buf.Path)
-    local result = handle:read("*a")
-    handle:close()
-
-    CurView():ReOpen()
-end
-
-function gorename()
-    local res, canceled = messenger:Prompt("Rename to:", "", 0)
-    if not canceled then
-        gorenameCmd(res)
-        CurView():Save(false)
+function gofmt(bp)
+    bp:Save()
+    local _, err = shell.RunCommand("gofmt -w " .. bp.Buf.Path)
+    if err ~= nil then
+        micro.InfoBar():Error(err)
+        return
     end
+
+    bp.Buf:ReOpen()
 end
 
-function gorenameCmd(res)
-    CurView():Save(false)
-    local v = CurView()
-    local c = v.Cursor
-    local buf = v.Buf
-    local loc = Loc(c.X, c.Y)
-    local offset = ByteOffset(loc, buf)
-    if #res > 0 then
-        local cmd = "gorename --offset " .. CurView().Buf.Path .. ":#" .. tostring(offset) .. " --to " .. res
-        JobStart(cmd, "", "go.renameStderr", "go.renameExit")
-        messenger:Message("Renaming...")
+function gorenameCmd(bp, args)
+    micro.Log(args)
+    if #args == 0 then
+        micro.InfoBar():Message("Not enough arguments")
+    else
+        bp:Save()
+        local buf = bp.Buf
+        if #args == 1 then
+            local c = bp.Cursor
+            local loc = buffer.Loc(c.X, c.Y)
+            local offset = buffer.ByteOffset(loc, buf)
+            local cmdargs = {"--offset", buf.Path .. ":#" .. tostring(offset), "--to", args[1]}
+            shell.JobSpawn("gorename", cmdargs, "", "go.renameStderr", "go.renameExit", bp)
+        else
+            local cmdargs = {"--from", args[1], "--to", args[2]}
+            shell.JobSpawn("gorename", cmdargs, "", "go.renameStderr", "go.renameExit", bp)
+        end
+        micro.InfoBar():Message("Renaming...")
     end
 end
 
 function renameStderr(err)
-    messenger:Error(err)
-end
-
-function renameExit()
-    CurView():ReOpen()
-    messenger:Message("Done")
+    micro.Log(err)
+    micro.InfoBar():Message(err)
 end
 
-function goimports()
-    CurView():Save(false)
-    local handle = io.popen("goimports -w " .. CurView().Buf.Path)
-    local result = split(handle:read("*a"), ":")
-    handle:close()
-
-    CurView():ReOpen()
+function renameExit(output, args)
+    local bp = args[1]
+    bp.Buf:ReOpen()
 end
 
-function split(str, sep)
-    local result = {}
-    local regex = ("([^%s]+)"):format(sep)
-    for each in str:gmatch(regex) do
-        table.insert(result, each)
+function goimports(bp)
+    bp:Save()
+    local _, err = shell.RunCommand("goimports -w " .. bp.Buf.Path)
+    if err ~= nil then
+        micro.InfoBar():Error(err)
+        return
     end
-    return result
-end
 
-AddRuntimeFile("go", "help", "help/go-plugin.md")
-BindKey("F6", "go.gorename")
-MakeCommand("gorename", "go.gorenameCmd", 0)
+    bp.Buf:ReOpen()
+end

help/go-plugin.md

@@ -29,3 +29,14 @@ to rename and enter the command `> gorename newName`.
 
 You also press F6 (the default binding) to open a prompt to rename. You
 can rebind this in your `bindings.json` file with the action `go.gorename`.
+
+The go plugin also provides an interface for using `gorename` if you have
+it installed. The gorename command behaves in two ways:
+
+* With one argument: `> gorename newname` will rename the identifier
+  under the cursor with the new name `newname`.
+
+* With two arguments: `> gorename oldname newname` will rename the old
+  identifier with the new one. This uses gorename's syntax for specifying
+  the old identifier, so please see `gorename --help` for the details
+  for how to specify the variable.

info.json

@@ -0,0 +1,10 @@
+{
+    "name": "go",
+    "description": "Go plugin",
+    "website": "",
+    "install": "",
+    "version": "1.0.0",
+    "require": [
+        "micro >= 2.0.0"
+    ]
+}