Merge branch 'getgauge:master' into master

Author: haroon-sheikh

.github/dependabot.yml

@@ -1,32 +1,36 @@
 version: 2
 updates:
-- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: weekly
-  allow:
-    - dependency-type: all
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule: 
-    interval: weekly
-  groups:
-    github-actions:
-      patterns:
-        - "*"
-- package-ecosystem: npm
-  directory: "/build/npm"
-  schedule:
-    interval: weekly
-  groups:
-    build-npm:
-      patterns:
-        - "*"
-- package-ecosystem: pip
-  directory: "build/pip"
-  schedule:
-    interval: weekly
-  groups:
-    build-python:
-      patterns:
-        - "*"
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: monthly
+    allow:
+      - dependency-type: all
+    groups:
+      go:
+        patterns:
+          - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: npm
+    directory: "/build/npm"
+    schedule:
+      interval: monthly
+    groups:
+      build-npm:
+        patterns:
+          - "*"
+  - package-ecosystem: pip
+    directory: "build/pip"
+    schedule:
+      interval: monthly
+    groups:
+      build-python:
+        patterns:
+          - "*"

.github/workflows/release.yml

@@ -178,7 +178,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: 'build/npm/package-lock.json'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/tests.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Set up Nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: 'build/npm/package-lock.json'
 

api/lang/diagnostics_test.go

@@ -69,7 +69,7 @@ Scenario Heading
 				Start: lsp.Position{Line: 0, Character: 0},
 				End:   lsp.Position{Line: 1, Character: 21},
 			},
-			Message:  "Spec should have atleast one scenario",
+			Message:  "Spec should have at least one scenario",
 			Severity: 1,
 		},
 		{
@@ -163,7 +163,7 @@ func TestDiagnosticsForConceptParseErrors(t *testing.T) {
 				Start: lsp.Position{Line: 0, Character: 0},
 				End:   lsp.Position{Line: 0, Character: 9},
 			},
-			Message:  "Concept should have atleast one step",
+			Message:  "Concept should have at least one step",
 			Severity: 1,
 		},
 	}

api/lang/format.go

@@ -32,26 +32,30 @@ func format(request *jsonrpc2.Request) (interface{}, error) {
 			return nil, err
 		}
 		if !parseResult.Ok {
-			return nil, fmt.Errorf("failed to format document. Fix all the problems first")
+			return nil, fmt.Errorf("failed to format %s. Fix all the problems first", file)
 		}
 		newString := formatter.FormatSpecification(spec)
 		oldString := getContent(params.TextDocument.URI)
 		textEdit := createTextEdit(newString, 0, 0, len(strings.Split(oldString, "\n")), len(oldString))
 		return []lsp.TextEdit{textEdit}, nil
 	} else if util.IsValidConceptExtension(file) {
 		conceptsDictionary := gauge.NewConceptDictionary()
-		_, parseErrs, err := parser.AddConcepts([]string{file}, conceptsDictionary)
+		conceptSteps, parseResult := new(parser.ConceptParser).Parse(getContent(params.TextDocument.URI), file)
+		if !parseResult.Ok {
+			return nil, fmt.Errorf("failed to format %s. Fix all the problems first", file)
+		}
+		parseErrs, err := parser.AddConcept(conceptSteps, file, conceptsDictionary)
 		if err != nil {
 			return nil, err
 		}
-		if parseErrs != nil {
-			return nil, fmt.Errorf("failed to format document. Fix all the problems first")
+		if len(parseErrs) > 0 {
+			return nil, fmt.Errorf("failed to format %s. Fix all the problems first", file)
 		}
 		conceptMap := formatter.FormatConcepts(conceptsDictionary)
 		newString := conceptMap[file]
 		oldString := getContent(params.TextDocument.URI)
 		textEdit := createTextEdit(newString, 0, 0, len(strings.Split(oldString, "\n")), len(oldString))
 		return []lsp.TextEdit{textEdit}, nil
 	}
-	return nil, fmt.Errorf("failed to format document. %s is not a valid spec/cpt file", file)
+	return nil, fmt.Errorf("failed to format %s. Not a valid spec/cpt file", file)
 }

api/lang/format_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/sourcegraph/jsonrpc2"
 )
 
-func TestFormat(t *testing.T) {
+func TestSpecFormat(t *testing.T) {
 	specText := `# Specification Heading
 
 ## Scenario Heading
@@ -50,7 +50,7 @@ func TestFormat(t *testing.T) {
 	}
 }
 
-func TestFormatParseError(t *testing.T) {
+func TestSpecFormatParseError(t *testing.T) {
 	specText := `Specification Heading
 =====================
 
@@ -67,7 +67,7 @@ func TestFormatParseError(t *testing.T) {
 	b, _ := json.Marshal(lsp.DocumentFormattingParams{TextDocument: lsp.TextDocumentIdentifier{URI: specFile}, Options: lsp.FormattingOptions{}})
 	p := json.RawMessage(b)
 
-	expectedError := fmt.Errorf("failed to format document. Fix all the problems first")
+	expectedError := fmt.Errorf("failed to format foo.spec. Fix all the problems first")
 
 	data, err := format(&jsonrpc2.Request{Params: &p})
 	if data != nil {
@@ -76,5 +76,58 @@ func TestFormatParseError(t *testing.T) {
 	if err.Error() != expectedError.Error() {
 		t.Fatalf(" want : %s\ngot : %s", expectedError.Error(), err.Error())
 	}
+}
+
+func TestConceptFormat(t *testing.T) {
+	conceptText := `# Concept Scenario Heading
+
+* Step text`
+
+	openFilesCache = &files{cache: make(map[lsp.DocumentURI][]string)}
+	openFilesCache.add("foo.cpt", conceptText)
+
+	want := []lsp.TextEdit{
+		{
+			Range: lsp.Range{
+				Start: lsp.Position{Line: 0, Character: 0},
+				End:   lsp.Position{Line: 3, Character: 39},
+			},
+			NewText: conceptText + "\n",
+		},
+	}
+
+	b, _ := json.Marshal(lsp.DocumentFormattingParams{TextDocument: lsp.TextDocumentIdentifier{URI: "foo.cpt"}, Options: lsp.FormattingOptions{}})
+	p := json.RawMessage(b)
+
+	got, err := format(&jsonrpc2.Request{Params: &p})
+	if err != nil {
+		t.Fatalf("Expected error == nil in format, got %s", err.Error())
+	}
 
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("format failed, want: `%v`, got: `%v`", want, got)
+	}
+}
+
+func TestConceptFormatParseError(t *testing.T) {
+	conceptText := `Concept Scenario Heading
+* Step text`
+
+	openFilesCache = &files{cache: make(map[lsp.DocumentURI][]string)}
+	openFilesCache.add("foo.cpt", conceptText)
+
+	conceptFile := lsp.DocumentURI("foo.cpt")
+
+	b, _ := json.Marshal(lsp.DocumentFormattingParams{TextDocument: lsp.TextDocumentIdentifier{URI: conceptFile}, Options: lsp.FormattingOptions{}})
+	p := json.RawMessage(b)
+
+	expectedError := fmt.Errorf("failed to format foo.cpt. Fix all the problems first")
+
+	data, err := format(&jsonrpc2.Request{Params: &p})
+	if data != nil {
+		t.Fatalf("Expected data == nil in format, got %s", data)
+	}
+	if err.Error() != expectedError.Error() {
+		t.Fatalf(" want : %s\ngot : %s", expectedError.Error(), err.Error())
+	}
 }

build/README.md

@@ -36,7 +36,6 @@ const (
 	bin               = "bin"
 	gauge             = "gauge"
 	deploy            = "deploy"
-	CC                = "CC"
 	nightlyDatelayout = "2006-01-02"
 )
 
@@ -159,8 +158,8 @@ var (
 		{GOARCH: ARM64, GOOS: linux, CGO_ENABLED: "0"},
 		{GOARCH: X86, GOOS: freebsd, CGO_ENABLED: "0"},
 		{GOARCH: X86_64, GOOS: freebsd, CGO_ENABLED: "0"},
-		{GOARCH: X86, GOOS: windows, CC: "i586-mingw32-gcc", CGO_ENABLED: "1"},
-		{GOARCH: X86_64, GOOS: windows, CC: "x86_64-w64-mingw32-gcc", CGO_ENABLED: "1"},
+		{GOARCH: X86, GOOS: windows, CGO_ENABLED: "0"},
+		{GOARCH: X86_64, GOOS: windows, CGO_ENABLED: "0"},
 	}
 	osDistroMap = map[string]distroFunc{windows: createWindowsDistro, linux: createLinuxPackage, freebsd: createLinuxPackage, darwin: createDarwinPackage}
 )