Merge branch 'vlang:main' into fix_module_index

README.md

@@ -149,7 +149,7 @@ The source code for extension is contained in the [`editors/code`](https://githu
 
 For Neovim users, v-analyzer is available via [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#v_analyzer) plugin.
 It is part of the [mason registry](https://mason-registry.dev/registry/list#v-analyzer) and could be installed with both Neovim plugins:
-- [mason.nvim](https://github.com/williamboman/mason.nvim) with `:MasonInstall v_analyzer` command
+- [mason.nvim](https://github.com/williamboman/mason.nvim) with `:MasonInstall v-analyzer` command
 - [mason-lspconfig.nvim](https://github.com/williamboman/mason-lspconfig.nvim) with `:LspInstall` command
 
 ## Authors

tree_sitter_v/grammar.js

@@ -561,9 +561,12 @@ module.exports = grammar({
 		short_element_list: ($) =>
 			repeat1(seq(alias($._expression, $.element), optional(list_separator))),
 
+		field_name: ($) =>
+			$.reference_expression,
+
 		keyed_element: ($) =>
 			seq(
-				field('key', alias($.reference_expression, $.field_name)),
+				field('key', $.field_name),
 				':',
 				field('value', $._expression),
 			),

tree_sitter_v/package.json

@@ -1,59 +1,49 @@
 {
-	"name": "tree-sitter-v",
-	"version": "0.0.4-beta.1",
-	"main": "bindings/node",
-	"types": "bindings/node",
-	"license": "MIT",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/vlang/v-analyzer.git"
-	},
-	"scripts": {
-		"test": "tree-sitter test",
-		"generate": "tree-sitter generate --no-bindings && v run bindings/generate_types.vsh",
-		"parse": "tree-sitter parse",
-		"parseg": "tree-sitter parse --debug-graph",
-		"install": "node-gyp-build",
-		"prebuildify": "prebuildify --napi --strip",
-		"lint": "eslint \"**/*.js\"",
-		"format": "prettier --write \"**/*.js\"",
-		"format:check": "prettier --check \"**/*.js\""
-	},
-	"dependencies": {
-		"node-addon-api": "^8.0.0",
-		"node-gyp-build": "^4.8.0"
-	},
-	"peerDependencies": {
-		"tree-sitter": "^0.21.1"
-	},
-	"peerDependenciesMeta": {
-		"tree_sitter": {
-			"optional": true
-		}
-	},
-	"devDependencies": {
-		"eslint": "^8.57.0",
-		"eslint-config-google": "^0.14.0",
-		"eslint-config-prettier": "^9.1.0",
-		"prebuildify": "^6.0.0",
-		"prettier": "^3.2.5",
-		"tree-sitter-cli": "^0.22.2"
-	},
-	"tree-sitter": [
-		{
-			"scope": "source.v",
-			"file-types": [
-				"v",
-				"vsh",
-				"v.mod"
-			]
-		}
-	],
-	"files": [
-		"grammar.js",
-		"prebuilds/**",
-		"bindings/node/*",
-		"queries/*",
-		"src/**"
-	]
-}
+  "name": "tree-sitter-v",
+  "version": "0.0.4-beta.1",
+  "main": "bindings/node",
+  "types": "bindings/node",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vlang/v-analyzer.git"
+  },
+  "scripts": {
+    "test": "tree-sitter test",
+    "generate": "tree-sitter generate --no-bindings && v run bindings/generate_types.vsh",
+    "parse": "tree-sitter parse",
+    "parseg": "tree-sitter parse --debug-graph",
+    "install": "node-gyp-build",
+    "prebuildify": "prebuildify --napi --strip",
+    "lint": "eslint \"**/*.js\"",
+    "format": "prettier --write \"**/*.js\"",
+    "format:check": "prettier --check \"**/*.js\""
+  },
+  "dependencies": {
+    "node-addon-api": "^8.0.0",
+    "node-gyp-build": "^4.8.0"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.1"
+  },
+  "peerDependenciesMeta": {
+    "tree_sitter": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "eslint": "^8.57.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-prettier": "^9.1.0",
+    "prebuildify": "^6.0.0",
+    "prettier": "^3.2.5",
+    "tree-sitter-cli": "^0.22.2"
+  },
+  "files": [
+    "grammar.js",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**"
+  ]
+}