Merge branch 'master' into dev

Author: Neko-Box-Coder

README.md

@@ -12,7 +12,6 @@
 > - [Adding timeout when fetching plugin & more clear plugin error message #3389](https://github.com/zyedidia/micro/pull/3389)
 > - [Adding Jumping to opening and closing brace logic and actions #3384](https://github.com/zyedidia/micro/pull/3384)
 > - [Adding auto complete support for multi cursors #3442](https://github.com/zyedidia/micro/pull/3442)
-> - [Fixing comment plugin not using user settings when overriding default setting #3424](https://github.com/zyedidia/micro/pull/3424)
 > - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
 > - [Adding error screen for lua functions running in status line #3691](https://github.com/zyedidia/micro/pull/3691)
 > - [Adding lua function to use result of RunBackgroundShell #3692](https://github.com/zyedidia/micro/pull/3692)
@@ -21,7 +20,7 @@
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
 
 ### Builds
-Just like the offical release, you can find the nightly build of this branch under [Nightly Release](https://github.com/Neko-Box-Coder/micro-dev/releases/tag/nightly)
+Just like the official release, you can find the nightly build of this branch under [Nightly Release](https://github.com/Neko-Box-Coder/micro-dev/releases/tag/nightly)
 
 > ### TODO
 > - Create CI/CD pipeline to build and release for new changes

cmd/micro/micro.go

@@ -317,7 +317,7 @@ func main() {
 	// flag options
 	for k, v := range optionFlags {
 		if *v != "" {
-			nativeValue, err := config.GetNativeValue(k, config.DefaultAllSettings()[k], *v)
+			nativeValue, err := config.GetNativeValue(k, *v)
 			if err != nil {
 				screen.TermMessage(err)
 				continue

internal/action/command.go

@@ -706,7 +706,7 @@ func SetGlobalOption(option, value string) error {
 		return config.ErrInvalidOption
 	}
 
-	nativeValue, err := config.GetNativeValue(option, config.GlobalSettings[option], value)
+	nativeValue, err := config.GetNativeValue(option, value)
 	if err != nil {
 		return err
 	}

internal/action/globals.go

@@ -11,7 +11,8 @@ var LogBufPane *BufPane
 // InitGlobals initializes the log buffer and the info bar
 func InitGlobals() {
 	InfoBar = NewInfoBar()
-	buffer.LogBuf = buffer.NewBufferFromString("", "Log", buffer.BTLog)
+	buffer.LogBuf = buffer.NewBufferFromString("", "", buffer.BTLog)
+	buffer.LogBuf.SetName("Log")
 }
 
 // GetInfoBar returns the infobar pane

internal/action/rawpane.go

@@ -22,7 +22,10 @@ func NewRawPaneFromWin(b *buffer.Buffer, win display.BWindow, tab *Tab) *RawPane
 
 func NewRawPane(tab *Tab) *RawPane {
 	b := buffer.NewBufferFromString("", "", buffer.BTRaw)
+	b.SetName("Raw event viewer")
+
 	w := display.NewBufWindow(0, 0, 0, 0, b)
+
 	return NewRawPaneFromWin(b, w, tab)
 }
 

internal/buffer/settings.go

@@ -155,7 +155,7 @@ func (b *Buffer) SetOption(option, value string) error {
 		return config.ErrInvalidOption
 	}
 
-	nativeValue, err := config.GetNativeValue(option, b.Settings[option], value)
+	nativeValue, err := config.GetNativeValue(option, value)
 	if err != nil {
 		return err
 	}

internal/config/settings.go

@@ -486,28 +486,30 @@ func DefaultAllSettings() map[string]interface{} {
 }
 
 // GetNativeValue parses and validates a value for a given option
-func GetNativeValue(option string, realValue interface{}, value string) (interface{}, error) {
-	var native interface{}
-	kind := reflect.TypeOf(realValue).Kind()
-	if kind == reflect.Bool {
+func GetNativeValue(option, value string) (interface{}, error) {
+	curVal := GetGlobalOption(option)
+	if curVal == nil {
+		return nil, ErrInvalidOption
+	}
+
+	switch kind := reflect.TypeOf(curVal).Kind(); kind {
+	case reflect.Bool:
 		b, err := util.ParseBool(value)
 		if err != nil {
 			return nil, ErrInvalidValue
 		}
-		native = b
-	} else if kind == reflect.String {
-		native = value
-	} else if kind == reflect.Float64 {
+		return b, nil
+	case reflect.String:
+		return value, nil
+	case reflect.Float64:
 		f, err := strconv.ParseFloat(value, 64)
 		if err != nil {
 			return nil, ErrInvalidValue
 		}
-		native = f
-	} else {
+		return f, nil
+	default:
 		return nil, ErrInvalidValue
 	}
-
-	return native, nil
 }
 
 // OptionIsValid checks if a value is valid for a certain option

runtime/syntax/prql.yaml

@@ -0,0 +1,84 @@
+# https://prql-lang.org/
+# https://github.com/PRQL/prql
+filetype: prql
+
+detect:
+    filename: "\\.prql$"
+
+rules:
+    - statement: "\\b(let|module|into|case|type|func)\\b"
+
+      # Types
+    - type: "\\b(u?int(8|16|32|64)?|float(32|64)|bool|text|date|time|timestamp)\\b"
+    - type.keyword: "\\b(enum)\\b"
+    - constant.bool: "\\b(true|false|null|this|that)\\b"
+
+      # Built-in functions
+    - identifier: "\\b(abs|floor|ceil|pi|exp|ln|log10|log|sqrt|degrees|radians|cos|acos|sin|asin|tan|atan|pow|round)\\b" # Math module
+    - identifier: "\\b(min|max|sum|average|stddev|all|any|concat_array|count)\\b" # Aggregate functions
+    - identifier: "\\b(lag|lead|first|last|rank|rank_dense|row_number)\\b" # Window functions
+    - identifier: "\\b(tuple_every|tuple_map|tuple_zip|_eq|_is_null)\\b" # Tuple functions
+    - identifier: "\\b(as|in|from_text)\\b" # Misc
+    - identifier: "\\b(lower|upper|ltrim|rtrim|trim|length|extract|replace|starts_with|contains|ends_with)\\b" # Text module
+    - identifier: "\\b(to_text)\\b" # Date module
+    - identifier: "\\b(read_parquet|read_csv)\\b" # File-reading functions
+
+      # Modules
+    - identifier.class: "\\b(math|text|date|prql)\\b"
+
+      # Transforms
+    - statement: "\\b(aggregate|derive|filter|from|group|join|select|sort|take|window)\\b"
+
+      # Operators
+    - symbol.operator: "([~^.:;,+*|=!\\%@?]|<|>|/|-|&)"
+
+      # Brackets
+    - symbol.brackets: "[{}()\\[\\]]"
+
+      # Numbers
+    - constant.number: "\\b[0-9](_?[0-9])*(\\.([0-9](_?[0-9])*)?)?(e[0-9](_?[0-9])*)?\\b" # decimal
+    - constant.number: "\\b0b(_?[01])+\\b"     # bin
+    - constant.number: "\\b0o(_?[0-7])+\\b"    # oct
+    - constant.number: "\\b0x(_?[0-9a-fA-F])+\\b" # hex
+    - constant: "\\b[0-9]+(years|months|weeks|days|hours|minutes|seconds|milliseconds|microseconds)\\b"
+
+    - constant.string:
+        start: "[frs]?\"\"\""
+        end: "\"\"\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[bfnrt'\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u\\{[0-9A-Fa-f]{1,6}\\})"
+
+    - constant.string:
+        start: "[frs]?'''"
+        end: "'''"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[bfnrt'\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u\\{[0-9A-Fa-f]{1,6}\\})"
+
+    - constant.string:
+        start: "[frs]?\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[bfnrt'\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u\\{[0-9A-Fa-f]{1,6}\\})"
+
+    - constant.string:
+        start: "[frs]?'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[bfnrt'\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u\\{[0-9A-Fa-f]{1,6}\\})"
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|FIXME|NOTE):?"
+
+      # Decorators
+    - preproc: "@\\{([a-z]+(=[a-z0-9]+,?)?)*\\}"