chore: coderabbit reviews

Author: ItsMeBrianD

cmd/build.go

@@ -128,7 +128,7 @@ func flushProject(root *lib.FileTreeLike, rootPath string) {
 func mkdirIfNotExists(dirPath string) error {
 	_, err := fs.Stat(os.DirFS("."), dirPath)
 	if err != nil {
-		if strings.HasSuffix(err.Error(), "no such file or directory") {
+		if os.IsNotExist(err) {
 			err = os.MkdirAll(dirPath, 0755)
 			if err != nil {
 				return err

flake.nix

@@ -66,7 +66,7 @@
 
         packages.default = pkgs.buildGoModule {
           pname = "mms";
-          version = "0.3.4";
+          version = "0.4.0";
           src = ./.;
           vendorHash = null;
           # If you use vendoring, run `go mod vendor` and replace null with the hash
@@ -79,7 +79,7 @@
 
         packages.wasm = pkgs.stdenvNoCC.mkDerivation {
           pname = "mms-wasm";
-          version = "0.3.4";
+          version = "0.4.0";
           src = ./.;
           buildInputs = [ pkgs.go ];
           buildPhase = ''

lang/DensityFn.go

@@ -141,7 +141,11 @@ var Cache = spec.NewFunctionSpec(
 		}
 
 		kind := "minecraft:"
-		switch v := spec.GetEnumNodeValue(n.Arguments[0]); *v {
+		v := spec.GetEnumNodeValue(n.Arguments[0])
+		if v == nil {
+			return nil
+		}
+		switch *v {
 		case "flat":
 			kind += "flat_cache"
 		case "2d":
@@ -397,6 +401,9 @@ func serializeRangeChoice(n spec.FunctionNode) any {
 }
 
 func getDensityFn(n spec.FunctionNode) any {
+	if len(n.Arguments) == 0 {
+		return nil
+	}
 	switch arg := n.Arguments[0].(type) {
 	case ast.Symbol:
 		return arg.ToSerializable()

lang/Dimensions.go

@@ -51,7 +51,7 @@ func serializeDimensionType(n spec.FunctionNode) any {
 		MonsterLightLevel float64 `json:"monster_light_level" mms_builder:"MonsterLightLevel"`
 		MonsterLightLimit float64 `json:"monster_light_limit" mms_builder:"MonsterLightLimit"`
 		LogicalHeight     float64 `json:"logical_height" mms_builder:"LogicalHeight"`
-		CloudHeight       float64 `json:"cloud_height" mms_builder:"CLoudHeight"`
+		CloudHeight       float64 `json:"cloud_height" mms_builder:"CloudHeight"`
 		MinY              float64 `json:"min_y" mms_builder:"MinY"`
 		Height            float64 `json:"height" mms_builder:"Height"`
 

lang/Noise.go

@@ -101,15 +101,15 @@ func GetInlinedNoiseRef(v ast.Node) string {
 	}
 	if val := spec.GetReferenceNodeValue(v, ast.SymbolNoise); !lib.IsNilInterface(val) {
 		return *val
-	} else if fn := v.(*spec.FunctionNode); fn != nil {
+	} else if fn, ok := v.(*spec.FunctionNode); ok && fn != nil {
 		return fn.Ref()
 	}
 	return ""
 }
 
 func ExtractInlineNoiseSymbol(argIdx int) func(spec.FunctionNode) []ast.Symbol {
 	return func(fn spec.FunctionNode) []ast.Symbol {
-		if len(fn.Arguments) < 1 {
+		if argIdx < 0 || argIdx >= len(fn.Arguments) {
 			return nil
 		}
 		if inlineNoise, ok := fn.Arguments[argIdx].(*spec.FunctionNode); ok {

lang/SharedBuilders.go

@@ -18,7 +18,7 @@ var SimpleFloatFn = spec.NewOverloadSpec(
 )
 var SimpleIntFn = spec.NewOverloadSpec(
 	[]spec.ValueSpec{
-		spec.NewNumberSpec(true),
+		spec.NewNumberSpec(false),
 	},
 	nil,
 	nil,

lang/ast/DiagnosticErrorListener.go

@@ -47,8 +47,8 @@ func (l *DiagnosticsErrorListener) SyntaxError(recognizer antlr.Recognizer, offe
 	}
 
 	loc := SourceLocation{
-		Start:    Location{Line: line, Column: startCol},
-		Stop:     Location{Line: line, Column: stopCol},
+		Start:    Location{Line: line, Column: startCol, Index: startIdx},
+		Stop:     Location{Line: line, Column: stopCol, Index: stopIdx},
 		Filename: l.filename,
 	}
 	l.diagnostics.Add(Diagnostic{

lang/ast/Locations.go

@@ -76,7 +76,11 @@ func (sl SourceLocation) ToLspRange() protocol.Range {
 }
 
 func (sl SourceLocation) Intersects(other SourceLocation) bool {
-	return sl.ContainsLocation(other.Start) || sl.ContainsLocation(other.Stop)
+	selfContainsOtherBound := sl.ContainsLocation(other.Start) || sl.ContainsLocation(other.Stop)
+	otherContainsSelfBound := other.ContainsLocation(sl.Start) || other.ContainsLocation(sl.Stop)
+
+	return selfContainsOtherBound || otherContainsSelfBound
+
 }
 
 func (sl SourceLocation) Contains(other SourceLocation) bool {
@@ -88,10 +92,10 @@ func (sl SourceLocation) ContainsLocation(l Location) bool {
 	if !lineContained {
 		return false
 	}
-	if sl.Start.Line == l.Line && sl.Start.Column >= l.Column {
+	if sl.Start.Line == l.Line && sl.Start.Column > l.Column {
 		return false
 	}
-	if sl.Stop.Line == l.Line && sl.Stop.Column <= l.Column {
+	if sl.Stop.Line == l.Line && sl.Stop.Column < l.Column {
 		return false
 	}
 	return true

lang/spec/Block.go

@@ -37,7 +37,8 @@ func NewBlockSpecList(
 		blocks: make(map[string]*BlockSpec),
 	}
 	for _, bs := range blocks {
-		out.Add(&bs)
+		bsCopy := bs
+		out.Add(&bsCopy)
 	}
 	return out
 }

lang/spec/Enum.go

@@ -79,9 +79,8 @@ func (e EnumSpec) Match(valueCtx grammar.IValueContext) (ast.Node, []ast.Diagnos
 		spec:  e,
 		Value: value,
 		BaseSymbol: ast.BaseSymbol{
-			BaseNode: ast.BaseNode{
-				Location: &l,
-			},
+			Location: &l,
+			BaseNode: ast.BaseNode{},
 		},
 	}