Merge pull request #34 from Myzel394/small-fixes-windows

Improvements

Author: Myzel394

flake.lock

@@ -23,7 +23,7 @@
       "aarch64-windows"
     ] (system: 
       let
-        version = "0.1.2"; # CI:CD-VERSION
+        version = "0.1.3"; # CI:CD-VERSION
         pkgs = import nixpkgs {
           inherit system;
           overlays = [

flake.nix

@@ -0,0 +1,5 @@
+package common
+
+import "github.com/tliron/commonlog"
+
+var Log = commonlog.GetLogger("config-lsp")

server/common/log.go

@@ -0,0 +1,25 @@
+package common
+
+import (
+	"os"
+	"slices"
+)
+
+// Global options for the server
+type ServerOptionsType struct {
+	// If true, the server will not return any errors if the
+	// language was undetectable.
+	// This is used for example in the VS Code extension, where
+	// we show a native warning. The error message boxes just clutter
+	// the interface.
+	NoUndetectableErrors bool
+}
+
+var ServerOptions = new(ServerOptionsType)
+
+func InitServerOptions() {
+	if slices.Contains(os.Args, "--no-undetectable-errors") {
+		Log.Info("config-lsp will not return errors for undetectable files")
+		ServerOptions.NoUndetectableErrors = true
+	}
+}

server/common/options.go

@@ -66,8 +66,7 @@ func checkOption(
 		invalidValues := docOption.DeprecatedCheckIsValid(option.OptionValue.Value.Value)
 
 		for _, invalidValue := range invalidValues {
-			err := docvalues.LSPErrorFromInvalidValue(option.Start.Line, *invalidValue)
-			err.ShiftCharacter(option.OptionValue.Start.Character)
+			err := docvalues.LSPErrorFromInvalidValue(option.Start.Line, *invalidValue).ShiftCharacter(option.OptionValue.Start.Character)
 
 			ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
 				Range:    err.Range.ToLSPRange(),

server/handlers/ssh_config/analyzer/options.go

@@ -8,6 +8,7 @@ import (
 func analyzeValuesAreValid(
 	ctx *analyzerContext,
 ) {
+	// Check if there are unknown options
 	for _, info := range ctx.document.Config.GetAllOptions() {
 		option := info.Option
 		block := info.Block

server/handlers/ssh_config/analyzer/values.go

@@ -129,8 +129,7 @@ func analyzeMatchValueIsValid(
 	invalidValues := docOption.DeprecatedCheckIsValid(value.Value.Raw)
 
 	for _, invalidValue := range invalidValues {
-		err := docvalues.LSPErrorFromInvalidValue(value.Start.Line, *invalidValue)
-		err.ShiftCharacter(value.Start.Character)
+		err := docvalues.LSPErrorFromInvalidValue(value.Start.Line, *invalidValue).ShiftCharacter(value.Start.Character)
 
 		ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
 			Range:    err.Range.ToLSPRange(),

server/handlers/sshd_config/analyzer/match.go

@@ -68,8 +68,7 @@ func checkOption(
 		invalidValues := docOption.DeprecatedCheckIsValid(option.OptionValue.Value.Value)
 
 		for _, invalidValue := range invalidValues {
-			err := docvalues.LSPErrorFromInvalidValue(option.Start.Line, *invalidValue)
-			err.ShiftCharacter(option.OptionValue.Start.Character)
+			err := docvalues.LSPErrorFromInvalidValue(option.Start.Line, *invalidValue).ShiftCharacter(option.OptionValue.Start.Character)
 
 			ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
 				Range:    err.Range.ToLSPRange(),

server/handlers/sshd_config/analyzer/options.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"config-lsp/common"
 	roothandler "config-lsp/root-handler"
 	"fmt"
 	"os"
@@ -23,5 +24,6 @@ func main() {
 	// This increases logging verbosity (optional)
 	commonlog.Configure(1, nil)
 
+	common.InitServerOptions()
 	roothandler.SetUpRootHandler()
 }

server/main.go

@@ -2,4 +2,4 @@ package roothandler
 
 // The comment below at the end of the line is required for the CI:CD to work.
 // Do not remove it
-var Version = "0.1.2" // CI:CD-VERSION
+var Version = "0.1.3" // CI:CD-VERSION