Fix issues with cursor locations

Author: zyedidia

README.md

@@ -4,4 +4,4 @@ This plugin provides automatic commenting/uncommenting for micro.
 
 Install with `> plugin install comment`.
 
-See the [docs](https://github.com/micro-editor/comment-plugin/blob/master/help/comment.md) for more details.
+See the [docs](https://github.com/micro-editor/comment-plugin/blob/master/help/comment-plugin.md) for more details.

comment.lua

@@ -1,23 +1,20 @@
-VERSION = "1.0.5"
+VERSION = "1.0.6"
 
 ft = {}
 
 ft["c"] = "// %s"
-ft["c++"] = "// %s"
-ft["d"] = "// %s"
 ft["go"] = "// %s"
+ft["python"] = "# %s"
+ft["python3"] = "# %s"
 ft["html"] = "<!-- %s -->"
 ft["java"] = "// %s"
-ft["javascript"] = "// %s"
-ft["julia"] = "# %s"
-ft["lua"] = "-- %s"
 ft["perl"] = "# %s"
-ft["php"] = "// %s"
-ft["python"] = "# %s"
-ft["python3"] = "# %s"
-ft["ruby"] = "# %s"
 ft["rust"] = "// %s"
 ft["shell"] = "# %s"
+ft["lua"] = "-- %s"
+ft["javascript"] = "// %s"
+ft["ruby"] = "# %s"
+ft["d"] = "// %s"
 ft["swift"] = "// %s"
 
 function onViewOpen(v)
@@ -34,32 +31,33 @@ function commentLine(lineN)
     local v = CurView()
     local line = v.Buf:Line(lineN)
     local commentType = v.Buf.Settings["commenttype"]
-    if commentType == "" or not string.find(commentType, "%%s") then
-        return
-    end
-    local commentRegex = "^%s*" .. commentType:gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%[", "%["):gsub("%%s", "(.*)")
+    local commentRegex = "^%s*" .. commentType:gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%]", "%]"):gsub("%[", "%["):gsub("%%s", "(.*)")
+    local sel = -v.Buf.Cursor.CurSelection
+    local curpos = -v.Buf.Cursor.Loc
     local index = string.find(commentType, "%%s") - 1
     if string.match(line, commentRegex) then
         uncommentedLine = string.match(line, commentRegex)
         v.Buf:Replace(Loc(0, lineN), Loc(#line, lineN), GetLeadingWhitespace(line) .. uncommentedLine)
         if v.Buf.Cursor:HasSelection() then
-            if v.Buf.Cursor.CurSelection[1].Y == v.Buf.Cursor.CurSelection[2].Y then
-                v.Buf.Cursor.CurSelection[1].X = v.Buf.Cursor.CurSelection[1].X - index
-                v.Buf.Cursor.CurSelection[2].X = v.Buf.Cursor.CurSelection[2].X - index
-            end
+            v.Buf.Cursor.CurSelection[1].Y = sel[1].Y
+            v.Buf.Cursor.CurSelection[2].Y = sel[2].Y
+            v.Buf.Cursor.CurSelection[1].X = sel[1].X
+            v.Buf.Cursor.CurSelection[2].X = sel[2].X
         else
-            v.Buf.Cursor.X = v.Buf.Cursor.X - index
+            v.Buf.Cursor.X = curpos.X - index
+            v.Buf.Cursor.Y = curpos.Y
         end
     else
         local commentedLine = commentType:gsub("%%s", trim(line))
         v.Buf:Replace(Loc(0, lineN), Loc(#line, lineN), GetLeadingWhitespace(line) .. commentedLine)
         if v.Buf.Cursor:HasSelection() then
-            if v.Buf.Cursor.CurSelection[1].Y == v.Buf.Cursor.CurSelection[2].Y then
-                v.Buf.Cursor.CurSelection[1].X = v.Buf.Cursor.CurSelection[1].X + index
-                v.Buf.Cursor.CurSelection[2].X = v.Buf.Cursor.CurSelection[2].X + index
-            end
+            v.Buf.Cursor.CurSelection[1].Y = sel[1].Y
+            v.Buf.Cursor.CurSelection[2].Y = sel[2].Y
+            v.Buf.Cursor.CurSelection[1].X = sel[1].X
+            v.Buf.Cursor.CurSelection[2].X = sel[2].X
         else
-            v.Buf.Cursor.X = v.Buf.Cursor.X + index
+            v.Buf.Cursor.X = curpos.X + index
+            v.Buf.Cursor.Y = curpos.Y
         end
     end
     v.Cursor:Relocate()
@@ -76,9 +74,17 @@ function comment()
     local v = CurView()
     if v.Cursor:HasSelection() then
         if v.Cursor.CurSelection[1]:GreaterThan(-v.Cursor.CurSelection[2]) then
-            commentSelection(v.Cursor.CurSelection[2].Y, v.Cursor.CurSelection[1].Y)
+            local endLine = v.Cursor.CurSelection[1].Y
+            if v.Cursor.CurSelection[1].X == 0 then
+                endLine = endLine - 1
+            end
+            commentSelection(v.Cursor.CurSelection[2].Y, endLine)
         else
-            commentSelection(v.Cursor.CurSelection[1].Y, v.Cursor.CurSelection[2].Y)
+            local endLine = v.Cursor.CurSelection[2].Y
+            if v.Cursor.CurSelection[2].X == 0 then
+                endLine = endLine - 1
+            end
+            commentSelection(v.Cursor.CurSelection[1].Y, endLine)
         end
     else
         commentLine(v.Cursor.Y)
@@ -97,4 +103,3 @@ MakeCommand("comment", "comment.comment")
 BindKey("Alt-/", "comment.comment")
 
 AddRuntimeFile("comment", "help", "help/comment-plugin.md")
-

repo.json

@@ -4,8 +4,8 @@
   "Tags": ["comment", "uncomment"],
   "Versions": [
     {
-      "Version": "1.0.5",
-      "Url": "https://github.com/micro-editor/comment-plugin/archive/v1.0.5.zip",
+      "Version": "1.0.6",
+      "Url": "https://github.com/micro-editor/comment-plugin/archive/v1.0.6.zip",
       "Require": {
         "micro": ">=1.1.0"
       }