Merge branch 'master' into dev

Neko-Box-Coder · Neko-Box-Coder · commit 66780d8c7c04 · 2025-03-30T15:19:59.000+01:00
diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/go-errors/errors"
 	isatty "github.com/mattn/go-isatty"
+	"github.com/micro-editor/tcell/v2"
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
@@ -26,7 +27,6 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var (
diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go
@@ -7,12 +7,12 @@ import (
 	"testing"
 
 	"github.com/go-errors/errors"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var tempDir string
diff --git a/internal/action/actions.go b/internal/action/actions.go
@@ -1039,7 +1039,6 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 				if err != nil {
 					InfoBar.Error(err)
 				} else {
-					h.Buf.SetName(filename)
 					InfoBar.Message("Saved " + filename)
 					if callback != nil {
 						callback()
@@ -1064,7 +1063,6 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 			InfoBar.Error(err)
 		}
 	} else {
-		h.Buf.SetName(filename)
 		InfoBar.Message("Saved " + filename)
 		if callback != nil {
 			callback()
diff --git a/internal/action/actions_other.go b/internal/action/actions_other.go
@@ -1,4 +1,4 @@
-// +build plan9 nacl windows
+//go:build plan9 || nacl || windows
 
 package action
 
diff --git a/internal/action/actions_posix.go b/internal/action/actions_posix.go
@@ -1,4 +1,4 @@
-// +build linux darwin dragonfly solaris openbsd netbsd freebsd
+//go:build linux || darwin || dragonfly || solaris || openbsd || netbsd || freebsd
 
 package action
 
diff --git a/internal/action/bindings.go b/internal/action/bindings.go
@@ -12,10 +12,10 @@ import (
 	"unicode"
 
 	"github.com/micro-editor/json5"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var Binder = map[string]func(e Event, action string){
diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go
@@ -6,14 +6,14 @@ import (
 
 	luar "layeh.com/gopher-luar"
 
+	"github.com/micro-editor/tcell/v2"
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type BufAction interface{}
diff --git a/internal/action/command.go b/internal/action/command.go
@@ -945,10 +945,7 @@ func (h *BufPane) SaveCmd(args []string) {
 	if len(args) == 0 {
 		h.Save()
 	} else {
-		err := h.Buf.SaveAs(args[0])
-		if err != nil {
-			InfoBar.Error(err)
-		}
+		h.saveBufToFile(args[0], "SaveAs", nil)
 	}
 }
 
diff --git a/internal/action/rawpane.go b/internal/action/rawpane.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/display"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type RawPane struct {
diff --git a/internal/action/tab.go b/internal/action/tab.go
@@ -3,13 +3,13 @@ package action
 import (
 	luar "layeh.com/gopher-luar"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/views"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // The TabList is a list of tabs and a window to display the tab bar
@@ -211,7 +211,7 @@ func InitTabs(bufs []*buffer.Buffer) {
 		for _, b := range bufs[1:] {
 			if multiopen == "vsplit" {
 				MainTab().CurPane().VSplitBuf(b)
-			} else {  // default hsplit
+			} else { // default hsplit
 				MainTab().CurPane().HSplitBuf(b)
 			}
 		}
diff --git a/internal/action/terminal_supported.go b/internal/action/terminal_supported.go
@@ -1,4 +1,4 @@
-// +build linux darwin dragonfly openbsd_amd64 freebsd
+//go:build linux || darwin || dragonfly || openbsd_amd64 || freebsd
 
 package action
 
diff --git a/internal/action/terminal_unsupported.go b/internal/action/terminal_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!darwin,!freebsd,!dragonfly,!openbsd_amd64
+//go:build !linux && !darwin && !freebsd && !dragonfly && !openbsd_amd64
 
 package action
 
diff --git a/internal/action/termpane.go b/internal/action/termpane.go
@@ -4,13 +4,13 @@ import (
 	"errors"
 	"runtime"
 
+	"github.com/micro-editor/tcell/v2"
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
 )
 
 type TermKeyAction func(*TermPane)
diff --git a/internal/buffer/message.go b/internal/buffer/message.go
@@ -1,8 +1,8 @@
 package buffer
 
 import (
-	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/v2/internal/config"
 )
 
 type MsgType int
diff --git a/internal/buffer/save.go b/internal/buffer/save.go
@@ -322,11 +322,16 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 		}
 	}
 
+	newPath := b.Path != filename
 	b.Path = filename
 	b.AbsPath = absFilename
 	b.isModified = false
 	b.UpdateModTime()
-	b.ReloadSettings(true)
+
+	if newPath {
+		// need to update glob-based and filetype-based settings
+		b.ReloadSettings(true)
+	}
 
 	err = b.Serialize()
 	return err
diff --git a/internal/clipboard/terminal.go b/internal/clipboard/terminal.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/v2/internal/screen"
 )
 
 type terminalClipboard struct{}
diff --git a/internal/config/colorscheme_test.go b/internal/config/colorscheme_test.go
@@ -3,8 +3,8 @@ package config
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSimpleStringToStyle(t *testing.T) {
diff --git a/internal/config/plugin.go b/internal/config/plugin.go
@@ -71,7 +71,7 @@ type Plugin struct {
 	Info    *PluginInfo   // json file containing info
 	Srcs    []RuntimeFile // lua files
 	Loaded  bool
-	Default bool          // pre-installed plugin
+	Default bool // pre-installed plugin
 }
 
 // IsLoaded returns if a plugin is enabled
diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	lua "github.com/yuin/gopher-lua"
 	"github.com/micro-editor/json5"
+	lua "github.com/yuin/gopher-lua"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/util"
 )
diff --git a/internal/config/settings.go b/internal/config/settings.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zyedidia/glob"
 	"github.com/micro-editor/json5"
+	"github.com/zyedidia/glob"
 	"github.com/zyedidia/micro/v2/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 )
diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go
@@ -4,11 +4,11 @@ import (
 	"strconv"
 
 	runewidth "github.com/mattn/go-runewidth"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // The BufWindow provides a way of displaying a certain section of a buffer.
diff --git a/internal/display/infowindow.go b/internal/display/infowindow.go
@@ -2,12 +2,12 @@ package display
 
 import (
 	runewidth "github.com/mattn/go-runewidth"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/info"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type InfoWindow struct {
diff --git a/internal/display/softwrap.go b/internal/display/softwrap.go
@@ -311,7 +311,7 @@ func (w *BufWindow) diff(s1, s2 SLoc) int {
 // within the buffer boundaries.
 func (w *BufWindow) Scroll(s SLoc, n int) SLoc {
 	if !w.Buf.Settings["softwrap"].(bool) {
-		s.Line = util.Clamp(s.Line + n, 0, w.Buf.LinesNum()-1)
+		s.Line = util.Clamp(s.Line+n, 0, w.Buf.LinesNum()-1)
 		return s
 	}
 	return w.scroll(s, n)
diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go
@@ -112,10 +112,10 @@ func (w *TabWindow) Display() {
 		}
 		return tabBarStyle, tabBarActiveStyle
 	}
-	
+
 	draw := func(r rune, n int, active bool, reversed bool) {
 		tabBarStyle, tabBarActiveStyle := reverseStyles(reversed)
-		
+
 		style := tabBarStyle
 		if active {
 			style = tabBarActiveStyle
@@ -147,23 +147,23 @@ func (w *TabWindow) Display() {
 		} else {
 			draw(' ', 1, false, tabCharHighlight)
 		}
-		
+
 		for _, c := range n {
 			draw(c, 1, i == w.active, tabCharHighlight)
 		}
-		
+
 		if i == len(w.Names)-1 {
 			done = true
 		}
-		
+
 		if i == w.active {
 			draw(']', 1, true, tabCharHighlight)
 			draw(' ', 2, true, globalTabReverse)
 		} else {
 			draw(' ', 1, false, tabCharHighlight)
 			draw(' ', 2, false, globalTabReverse)
 		}
-		
+
 		if x >= w.Width {
 			break
 		}
diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go
@@ -1,13 +1,13 @@
 package display
 
 import (
+	"github.com/micro-editor/tcell/v2"
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
 )
 
 type TermWindow struct {
diff --git a/internal/screen/screen.go b/internal/screen/screen.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"sync"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // Screen is the tcell screen we use to draw to the terminal
diff --git a/internal/shell/terminal.go b/internal/shell/terminal.go
@@ -5,9 +5,9 @@ import (
 	"os/exec"
 	"strconv"
 
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/micro-editor/terminal"
 )
 
 type TermType int
diff --git a/pkg/highlight/highlighter.go b/pkg/highlight/highlighter.go
@@ -162,7 +162,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 				if curRegion.group == curRegion.limitGroup || p.group == curRegion.limitGroup {
 					matches := findAllIndex(p.regex, line)
 					for _, m := range matches {
-						if ((endLoc == nil) || (m[0] < endLoc[0])) {
+						if (endLoc == nil) || (m[0] < endLoc[0]) {
 							for i := m[0]; i < m[1]; i++ {
 								fullHighlights[i] = p.group
 							}
diff --git a/runtime/help/keybindings.md b/runtime/help/keybindings.md
diff --git a/runtime/syntax/README.md b/runtime/syntax/README.md
diff --git a/runtime/syntax/asm.yaml b/runtime/syntax/asm.yaml
diff --git a/runtime/syntax/syntax_converter.go b/runtime/syntax/syntax_converter.go
diff --git a/tools/build-date.go b/tools/build-date.go
diff --git a/tools/build-version.go b/tools/build-version.go
diff --git a/tools/info-plist.go b/tools/info-plist.go
diff --git a/tools/remove-nightly-assets.go b/tools/remove-nightly-assets.go
diff --git a/tools/testgen.go b/tools/testgen.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build plan9 nacl windows`
	`1`	`+//go:build plan9 \|\| nacl \|\| windows`
`2`	`2`
`3`	`3`	`package action`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux darwin dragonfly solaris openbsd netbsd freebsd`
	`1`	`+//go:build linux \|\| darwin \|\| dragonfly \|\| solaris \|\| openbsd \|\| netbsd \|\| freebsd`
`2`	`2`
`3`	`3`	`package action`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -945,10 +945,7 @@ func (h *BufPane) SaveCmd(args []string) {`
`945`	`945`	`if len(args) == 0 {`
`946`	`946`	`h.Save()`
`947`	`947`	`} else {`
`948`		`- err := h.Buf.SaveAs(args[0])`
`949`		`- if err != nil {`
`950`		`- InfoBar.Error(err)`
`951`		`- }`
	`948`	`+ h.saveBufToFile(args[0], "SaveAs", nil)`
`952`	`949`	`}`
`953`	`950`	`}`
`954`	`951`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"reflect"`
`6`	`6`
	`7`	`+ "github.com/micro-editor/tcell/v2"`
`7`	`8`	`"github.com/zyedidia/micro/v2/internal/buffer"`
`8`	`9`	`"github.com/zyedidia/micro/v2/internal/display"`
`9`		`- "github.com/micro-editor/tcell/v2"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type RawPane struct {`