Merge branch 'main' into feat/twig-block-versioning

Author: wbm-mkopp

LSP.md

@@ -14,12 +14,12 @@ This document lists the custom LSP commands and notifications provided by the Sh
 * **Action:** Returns all detected Shopware extensions via the `ExtensionIndexer`.
 * **Returns:** array of objects with `Name`, `Type` and `Path` fields.
 
-### `shopware/snippet/getPossibleSnippetFilse`
+### `shopware/snippet/storefront/getPossibleSnippetFiles`
 * **Parameters:** `{ "fileUri": string }`
 * **Action:** Searches the snippet directory for JSON files or creates a default `storefront.en-GB.json` if none exist.
 * **Returns:** `{ "paths": [ { "path": string, "name": string, "value": string } ] }`
 
-### `shopware/snippet/create`
+### `shopware/snippet/storefront/create`
 * **Parameters:**
   ```json
   {
@@ -31,9 +31,31 @@ This document lists the custom LSP commands and notifications provided by the Sh
 * **Action:** Adds the provided snippet value to the given JSON files, reindexes them and publishes diagnostics for the original document.
 * **Returns:** `null`
 
-### `shopware/snippet/all`
+### `shopware/snippet/storefront/all`
 * **Parameters:** none
-* **Action:** Collects all snippet keys from the indexed snippet files.
+* **Action:** Collects all storefront snippet keys from the indexed snippet files.
+* **Returns:** array of objects `{ key, text, file }` sorted alphabetically.
+
+### `shopware/snippet/admin/getPossibleSnippetFiles`
+* **Parameters:** `{ "fileUri": string }`
+* **Action:** Searches the administration snippet directory for JSON files or creates a default structure if none exist.
+* **Returns:** `{ "paths": [ { "path": string, "name": string, "value": string } ] }`
+
+### `shopware/snippet/admin/create`
+* **Parameters:**
+  ```json
+  {
+    "fileUri": string,
+    "snippetKey": string,
+    "snippets": [ { "path": string, "name": string, "value": string } ]
+  }
+  ```
+* **Action:** Adds the provided snippet value to the given admin JSON files, reindexes them and publishes diagnostics for the original document.
+* **Returns:** `null`
+
+### `shopware/snippet/admin/all`
+* **Parameters:** none
+* **Action:** Collects all admin snippet keys from the indexed snippet files.
 * **Returns:** array of objects `{ key, text, file }` sorted alphabetically.
 
 ### `shopware/twig/extendBlock`

cmd/debug_ast/main.go

@@ -1,20 +1,163 @@
 package main
 
 import (
+	"flag"
 	"fmt"
+	"io"
 	"os"
+	"path/filepath"
+	"strings"
 
-	"github.com/shopware/shopware-lsp/internal/php"
+	tree_sitter_twig "github.com/shopware/shopware-lsp/internal/tree_sitter_grammars/twig/bindings/go"
+	tree_sitter "github.com/tree-sitter/go-tree-sitter"
+	tree_sitter_javascript "github.com/tree-sitter/tree-sitter-javascript/bindings/go"
+	tree_sitter_json "github.com/tree-sitter/tree-sitter-json/bindings/go"
+	tree_sitter_php "github.com/tree-sitter/tree-sitter-php/bindings/go"
 )
 
 func main() {
-	if len(os.Args) < 2 {
-		fmt.Println("Usage: go run cmd/debug_ast/main.go <php_file_path>")
+	lang := flag.String("lang", "", "Language to parse (php, js, twig, json). Auto-detected from extension if not specified.")
+	flag.Parse()
+
+	args := flag.Args()
+	if len(args) < 1 {
+		fmt.Println("Usage: go run cmd/debug_ast/main.go [-lang=php|js|twig|json] <file_path>")
+		fmt.Println("       go run cmd/debug_ast/main.go [-lang=php|js|twig|json] - < input.txt")
+		fmt.Println("")
+		fmt.Println("Options:")
+		fmt.Println("  -lang    Language to parse (php, js, twig, json)")
+		fmt.Println("           Auto-detected from file extension if not specified")
+		fmt.Println("")
+		fmt.Println("Examples:")
+		fmt.Println("  go run cmd/debug_ast/main.go example.php")
+		fmt.Println("  go run cmd/debug_ast/main.go -lang=js example.vue")
+		fmt.Println("  echo \"this.\\$tc('key')\" | go run cmd/debug_ast/main.go -lang=js -")
+		os.Exit(1)
+	}
+
+	filePath := args[0]
+
+	var fileContent []byte
+	var err error
+
+	if filePath == "-" {
+		// Read from stdin
+		fileContent, err = io.ReadAll(os.Stdin)
+		if err != nil {
+			fmt.Printf("Error reading stdin: %v\n", err)
+			os.Exit(1)
+		}
+		fmt.Println("Analyzing AST from stdin")
+	} else {
+		fileContent, err = os.ReadFile(filePath)
+		if err != nil {
+			fmt.Printf("Error reading file: %v\n", err)
+			os.Exit(1)
+		}
+		fmt.Printf("Analyzing AST for file: %s\n\n", filePath)
+	}
+
+	// Determine language
+	language := *lang
+	if language == "" && filePath != "-" {
+		language = detectLanguage(filePath)
+	}
+
+	if language == "" {
+		fmt.Println("Error: Could not detect language. Please specify -lang flag.")
+		os.Exit(1)
+	}
+
+	parser := tree_sitter.NewParser()
+	defer parser.Close()
+
+	var langErr error
+	switch strings.ToLower(language) {
+	case "php":
+		langErr = parser.SetLanguage(tree_sitter.NewLanguage(tree_sitter_php.LanguagePHP()))
+	case "js", "javascript":
+		langErr = parser.SetLanguage(tree_sitter.NewLanguage(tree_sitter_javascript.Language()))
+	case "twig":
+		langErr = parser.SetLanguage(tree_sitter.NewLanguage(tree_sitter_twig.Language()))
+	case "json":
+		langErr = parser.SetLanguage(tree_sitter.NewLanguage(tree_sitter_json.Language()))
+	default:
+		fmt.Printf("Error: Unsupported language '%s'. Supported: php, js, twig, json\n", language)
+		os.Exit(1)
+	}
+
+	if langErr != nil {
+		fmt.Printf("Error setting language: %v\n", langErr)
 		os.Exit(1)
 	}
 
-	filePath := os.Args[1]
-	fmt.Printf("Analyzing AST for file: %s\n\n", filePath)
+	tree := parser.Parse(fileContent, nil)
+	if tree == nil {
+		fmt.Println("Error: Failed to parse content")
+		os.Exit(1)
+	}
+	defer tree.Close()
+
+	fmt.Printf("Language: %s\n", language)
+	fmt.Printf("Content:\n---\n%s\n---\n\n", string(fileContent))
+
+	printNodeStructure(tree.RootNode(), fileContent, 0)
+}
 
-	php.DebugAST(filePath)
+func detectLanguage(filePath string) string {
+	ext := strings.ToLower(filepath.Ext(filePath))
+	switch ext {
+	case ".php":
+		return "php"
+	case ".js", ".mjs", ".cjs":
+		return "js"
+	case ".twig":
+		return "twig"
+	case ".json":
+		return "json"
+	default:
+		return ""
+	}
+}
+
+func printNodeStructure(node *tree_sitter.Node, fileContent []byte, depth int) {
+	if node == nil {
+		return
+	}
+
+	indent := ""
+	for i := 0; i < depth; i++ {
+		indent += "  "
+	}
+
+	// Get position info
+	startPos := node.StartPosition()
+	endPos := node.EndPosition()
+
+	nodeText := ""
+	if node.NamedChildCount() == 0 {
+		text := string(node.Utf8Text(fileContent))
+		// Truncate long text
+		if len(text) > 50 {
+			text = text[:47] + "..."
+		}
+		// Escape newlines for display
+		text = strings.ReplaceAll(text, "\n", "\\n")
+		text = strings.ReplaceAll(text, "\r", "\\r")
+		text = strings.ReplaceAll(text, "\t", "\\t")
+		nodeText = fmt.Sprintf(" = %q", text)
+	}
+
+	fmt.Printf("%s%s [%d:%d-%d:%d]%s\n",
+		indent,
+		node.Kind(),
+		startPos.Row, startPos.Column,
+		endPos.Row, endPos.Column,
+		nodeText,
+	)
+
+	// Recursively print child nodes
+	for i := uint(0); i < node.NamedChildCount(); i++ {
+		printNodeStructure(node.NamedChild(i), fileContent, depth+1)
+	}
 }

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/tree-sitter-grammars/tree-sitter-xml v0.7.0
 	github.com/tree-sitter-grammars/tree-sitter-yaml v0.7.2
 	github.com/tree-sitter/go-tree-sitter v0.25.0
+	github.com/tree-sitter/tree-sitter-javascript v0.25.0
 	github.com/tree-sitter/tree-sitter-json v0.24.8
 	github.com/tree-sitter/tree-sitter-php v0.24.2
 	github.com/vmihailenco/msgpack/v5 v5.4.1

go.sum

@@ -59,8 +59,8 @@ github.com/tree-sitter/tree-sitter-html v0.23.2 h1:1UYDV+Yd05GGRhVnTcbP58GkKLSHH
 github.com/tree-sitter/tree-sitter-html v0.23.2/go.mod h1:gpUv/dG3Xl/eebqgeYeFMt+JLOY9cgFinb/Nw08a9og=
 github.com/tree-sitter/tree-sitter-java v0.23.5 h1:J9YeMGMwXYlKSP3K4Us8CitC6hjtMjqpeOf2GGo6tig=
 github.com/tree-sitter/tree-sitter-java v0.23.5/go.mod h1:NRKlI8+EznxA7t1Yt3xtraPk1Wzqh3GAIC46wxvc320=
-github.com/tree-sitter/tree-sitter-javascript v0.23.1 h1:1fWupaRC0ArlHJ/QJzsfQ3Ibyopw7ZfQK4xXc40Zveo=
-github.com/tree-sitter/tree-sitter-javascript v0.23.1/go.mod h1:lmGD1EJdCA+v0S1u2fFgepMg/opzSg/4pgFym2FPGAs=
+github.com/tree-sitter/tree-sitter-javascript v0.25.0 h1:ZkWETb66/w8cc13yhfnNuHOLDQWl3BnKlH6f9AdR88c=
+github.com/tree-sitter/tree-sitter-javascript v0.25.0/go.mod h1:lmGD1EJdCA+v0S1u2fFgepMg/opzSg/4pgFym2FPGAs=
 github.com/tree-sitter/tree-sitter-json v0.24.8 h1:tV5rMkihgtiOe14a9LHfDY5kzTl5GNUYe6carZBn0fQ=
 github.com/tree-sitter/tree-sitter-json v0.24.8/go.mod h1:F351KK0KGvCaYbZ5zxwx/gWWvZhIDl0eMtn+1r+gQbo=
 github.com/tree-sitter/tree-sitter-php v0.24.2 h1:yy+COnaaHUNDTKODfNbHhVRD4mQpFELTnBK9+EhpO+w=

internal/admin/component.go

@@ -0,0 +1,83 @@
+package admin
+
+// VueComponent represents a Shopware 6 Admin Vue component
+type VueComponent struct {
+	// Name is the component name (e.g., "sw-base-filter")
+	Name string
+
+	// ExtendsComponent is the parent component name if this component extends another (empty for register)
+	ExtendsComponent string
+
+	// ImportPath is the path from the import statement (e.g., "src/app/component/filter/sw-base-filter/index")
+	ImportPath string
+
+	// FilePath is the absolute path to the registration file
+	FilePath string
+
+	// DefinitionPath is the resolved absolute path to the component definition file
+	DefinitionPath string
+
+	// Line is the line number where the component is registered
+	Line int
+
+	// Props contains the component's props definitions
+	Props []VueComponentProp
+
+	// Emits contains the component's emitted events
+	Emits []string
+
+	// Methods contains the component's method names
+	Methods []string
+
+	// Computed contains the component's computed property names
+	Computed []string
+
+	// Slots contains the component's slot definitions
+	Slots []VueComponentSlot
+
+	// Blocks contains the component's Twig block definitions
+	Blocks []TwigBlock
+
+	// TemplatePath is the path to the Twig template (from the template import)
+	TemplatePath string
+
+	// InlineDefinition contains the parsed definition for inline component registrations
+	// This is only populated during indexing and not persisted (used to store in definition index)
+	InlineDefinition *ComponentDefinition `msgpack:"-"`
+}
+
+// VueComponentProp represents a prop definition in a Vue component
+type VueComponentProp struct {
+	// Name is the prop name
+	Name string
+
+	// Type is the prop type (e.g., "String", "Boolean", "Object")
+	Type string
+
+	// Required indicates if the prop is required
+	Required bool
+
+	// Default is the default value (as string representation)
+	Default string
+
+	// Line is the line number where the prop is defined (1-based)
+	Line int
+}
+
+// VueComponentSlot represents a slot definition in a Vue component template
+type VueComponentSlot struct {
+	// Name is the slot name (e.g., "default", "actions", "header")
+	Name string
+
+	// Line is the line number where the slot is defined in the template (1-based)
+	Line int
+}
+
+// TwigBlock represents a Twig block definition in a component template
+type TwigBlock struct {
+	// Name is the block name (e.g., "sw_page_content", "sw_page_smart_bar")
+	Name string
+
+	// Line is the line number where the block is defined in the template (1-based)
+	Line int
+}