Merge branch 'CommentPluginFix' into dev

Author: Neko-Box-Coder

.github/workflows/nightly.yaml

@@ -25,7 +25,7 @@ jobs:
         fetch-tags: true
 
     - name: Build
-      run: tools/cross-compile.sh
+      run: tools/cross-compile.sh nightly
 
     - name: Tag
       uses: rickstaa/action-create-tag@v1

runtime/plugins/comment/comment.lua

@@ -61,17 +61,34 @@ ft["zig"] = "// %s"
 ft["zscript"] = "// %s"
 ft["zsh"] = "# %s"
 
-local last_ft
+function updateCommentType(bp)
+    -- This is the first time doing comment in this bp
+    if bp.Settings["commentfiletype"] == nil then
+        -- If commenttype is not registered, use the comment table we have
+        if bp.Settings["commenttype"] == nil then
+            if ft[bp.Settings["filetype"]] ~= nil then
+                bp.Settings["commenttype"] = ft[bp.Settings["filetype"]]
+            else
+                bp.Settings["commenttype"] = "# %s"
+            end
+        -- Otherwise if the commenttype is registered, that means this is coming from the settings, 
+        -- or set manually by the user. We should update our comment table
+        else
+            ft[bp.Settings["filetype"]] = bp.Settings["commenttype"]
+        end
+        -- Update filetype
+        bp.Settings["commentfiletype"] = bp.Settings["filetype"]
 
-function updateCommentType(buf)
-    if buf.Settings["commenttype"] == nil or (last_ft ~= buf.Settings["filetype"] and last_ft ~= nil) then
-        if ft[buf.Settings["filetype"]] ~= nil then
-            buf.Settings["commenttype"] = ft[buf.Settings["filetype"]]
+    -- Otherwise, check if the filetype has changed manually. If so, use the comment table
+    elseif bp.Settings["commentfiletype"] ~= bp.Settings["filetype"] then
+        if ft[bp.Settings["filetype"]] ~= nil then
+            bp.Settings["commenttype"] = ft[bp.Settings["filetype"]]
         else
-            buf.Settings["commenttype"] = "# %s"
+            bp.Settings["commenttype"] = "# %s"
         end
 
-        last_ft = buf.Settings["filetype"]
+        -- Update filetype
+        bp.Settings["commentfiletype"] = bp.Settings["filetype"]
     end
 end
 

tools/cross-compile.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-HASH="$(git rev-parse --short HEAD)"
-VERSION="$(go run tools/build-version.go)"
-DATE="$(go run tools/build-date.go)"
-ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)"
+VERSION="$1"
+if [ -z "$VERSION" ]; then
+	VERSION="$(go run tools/build-version.go)"
+fi
 
 mkdir -p binaries
 mkdir -p micro-$VERSION