@lzehrung/codegraph 2.3.29 → 2.3.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (324) hide show
  1. package/dist/bin/cli.js +6602 -4453
  2. package/dist/bin/query-index-worker.js +1302 -753
  3. package/dist/document-links/asciidoc.d.ts.map +1 -1
  4. package/dist/document-links/asciidoc.js +3 -4
  5. package/dist/document-links/asciidoc.js.map +1 -1
  6. package/dist/document-links/html-forms.d.ts +39 -0
  7. package/dist/document-links/html-forms.d.ts.map +1 -0
  8. package/dist/document-links/html-forms.js +94 -0
  9. package/dist/document-links/html-forms.js.map +1 -0
  10. package/dist/document-links/html.d.ts +8 -0
  11. package/dist/document-links/html.d.ts.map +1 -1
  12. package/dist/document-links/html.js +30 -15
  13. package/dist/document-links/html.js.map +1 -1
  14. package/dist/document-links/markdown.d.ts.map +1 -1
  15. package/dist/document-links/markdown.js +6 -7
  16. package/dist/document-links/markdown.js.map +1 -1
  17. package/dist/document-links/rst.d.ts.map +1 -1
  18. package/dist/document-links/rst.js +6 -0
  19. package/dist/document-links/rst.js.map +1 -1
  20. package/dist/document-links/sfc.d.ts.map +1 -1
  21. package/dist/document-links/sfc.js +4 -4
  22. package/dist/document-links/sfc.js.map +1 -1
  23. package/dist/graphs/angularjs.d.ts.map +1 -1
  24. package/dist/graphs/angularjs.js +9 -1
  25. package/dist/graphs/angularjs.js.map +1 -1
  26. package/dist/graphs/edge-resolution.d.ts.map +1 -1
  27. package/dist/graphs/edge-resolution.js +8 -3
  28. package/dist/graphs/edge-resolution.js.map +1 -1
  29. package/dist/graphs/specifiers.d.ts.map +1 -1
  30. package/dist/graphs/specifiers.js +62 -104
  31. package/dist/graphs/specifiers.js.map +1 -1
  32. package/dist/graphs/symbol-graph-detailed/edge-passes.d.ts.map +1 -1
  33. package/dist/graphs/symbol-graph-detailed/edge-passes.js +118 -86
  34. package/dist/graphs/symbol-graph-detailed/edge-passes.js.map +1 -1
  35. package/dist/graphs/symbol-graph-detailed/receiver-calls.d.ts +27 -0
  36. package/dist/graphs/symbol-graph-detailed/receiver-calls.d.ts.map +1 -1
  37. package/dist/graphs/symbol-graph-detailed/receiver-calls.js +509 -42
  38. package/dist/graphs/symbol-graph-detailed/receiver-calls.js.map +1 -1
  39. package/dist/impact/call-compatibility/providers/index.d.ts +15 -1
  40. package/dist/impact/call-compatibility/providers/index.d.ts.map +1 -1
  41. package/dist/impact/call-compatibility/providers/index.js +21 -20
  42. package/dist/impact/call-compatibility/providers/index.js.map +1 -1
  43. package/dist/impact/call-compatibility/providers/profiles.d.ts +80 -0
  44. package/dist/impact/call-compatibility/providers/profiles.d.ts.map +1 -0
  45. package/dist/impact/call-compatibility/providers/profiles.js +164 -0
  46. package/dist/impact/call-compatibility/providers/profiles.js.map +1 -0
  47. package/dist/impact/call-compatibility.d.ts.map +1 -1
  48. package/dist/impact/call-compatibility.js +73 -108
  49. package/dist/impact/call-compatibility.js.map +1 -1
  50. package/dist/impact/member-resolution-coverage.d.ts.map +1 -1
  51. package/dist/impact/member-resolution-coverage.js +2 -2
  52. package/dist/impact/member-resolution-coverage.js.map +1 -1
  53. package/dist/indexer/build-cache/manifest.d.ts +7 -0
  54. package/dist/indexer/build-cache/manifest.d.ts.map +1 -1
  55. package/dist/indexer/build-cache/manifest.js +32 -1
  56. package/dist/indexer/build-cache/manifest.js.map +1 -1
  57. package/dist/indexer/build-cache/options.d.ts +16 -2
  58. package/dist/indexer/build-cache/options.d.ts.map +1 -1
  59. package/dist/indexer/build-cache/options.js +17 -3
  60. package/dist/indexer/build-cache/options.js.map +1 -1
  61. package/dist/indexer/build-cache/project-snapshot.d.ts.map +1 -1
  62. package/dist/indexer/build-cache/project-snapshot.js +1 -0
  63. package/dist/indexer/build-cache/project-snapshot.js.map +1 -1
  64. package/dist/indexer/build-index.d.ts.map +1 -1
  65. package/dist/indexer/build-index.js +80 -2
  66. package/dist/indexer/build-index.js.map +1 -1
  67. package/dist/indexer/build-manifest.d.ts +1 -0
  68. package/dist/indexer/build-manifest.d.ts.map +1 -1
  69. package/dist/indexer/build-manifest.js +18 -0
  70. package/dist/indexer/build-manifest.js.map +1 -1
  71. package/dist/indexer/build-workers.js +1 -1
  72. package/dist/indexer/build-workers.js.map +1 -1
  73. package/dist/indexer/declaration-visibility.d.ts +43 -0
  74. package/dist/indexer/declaration-visibility.d.ts.map +1 -0
  75. package/dist/indexer/declaration-visibility.js +202 -0
  76. package/dist/indexer/declaration-visibility.js.map +1 -0
  77. package/dist/indexer/imports/binding-ranges.d.ts +2 -2
  78. package/dist/indexer/imports/binding-ranges.d.ts.map +1 -1
  79. package/dist/indexer/imports/binding-ranges.js +2 -123
  80. package/dist/indexer/imports/binding-ranges.js.map +1 -1
  81. package/dist/indexer/imports/import-binding-tables.d.ts +64 -0
  82. package/dist/indexer/imports/import-binding-tables.d.ts.map +1 -0
  83. package/dist/indexer/imports/import-binding-tables.js +419 -0
  84. package/dist/indexer/imports/import-binding-tables.js.map +1 -0
  85. package/dist/indexer/imports/js-text-imports.d.ts.map +1 -1
  86. package/dist/indexer/imports/js-text-imports.js +5 -2
  87. package/dist/indexer/imports/js-text-imports.js.map +1 -1
  88. package/dist/indexer/imports/language-specific.d.ts +3 -22
  89. package/dist/indexer/imports/language-specific.d.ts.map +1 -1
  90. package/dist/indexer/imports/language-specific.js +54 -573
  91. package/dist/indexer/imports/language-specific.js.map +1 -1
  92. package/dist/indexer/imports/native-captures.d.ts.map +1 -1
  93. package/dist/indexer/imports/native-captures.js +23 -32
  94. package/dist/indexer/imports/native-captures.js.map +1 -1
  95. package/dist/indexer/imports/text-import-extractors.d.ts +37 -0
  96. package/dist/indexer/imports/text-import-extractors.d.ts.map +1 -0
  97. package/dist/indexer/imports/text-import-extractors.js +358 -0
  98. package/dist/indexer/imports/text-import-extractors.js.map +1 -0
  99. package/dist/indexer/imports.d.ts.map +1 -1
  100. package/dist/indexer/imports.js +2 -1
  101. package/dist/indexer/imports.js.map +1 -1
  102. package/dist/indexer/locals-and-exports.d.ts.map +1 -1
  103. package/dist/indexer/locals-and-exports.js +23 -27
  104. package/dist/indexer/locals-and-exports.js.map +1 -1
  105. package/dist/indexer/navigation-goto.d.ts +1 -7
  106. package/dist/indexer/navigation-goto.d.ts.map +1 -1
  107. package/dist/indexer/navigation-goto.js +181 -381
  108. package/dist/indexer/navigation-goto.js.map +1 -1
  109. package/dist/indexer/navigation-resolve.d.ts.map +1 -1
  110. package/dist/indexer/navigation-resolve.js +20 -1
  111. package/dist/indexer/navigation-resolve.js.map +1 -1
  112. package/dist/indexer/navigation.d.ts.map +1 -1
  113. package/dist/indexer/navigation.js +39 -7
  114. package/dist/indexer/navigation.js.map +1 -1
  115. package/dist/indexer/parse-context.js +2 -2
  116. package/dist/indexer/parse-context.js.map +1 -1
  117. package/dist/indexer/scope-nodes.d.ts +108 -0
  118. package/dist/indexer/scope-nodes.d.ts.map +1 -0
  119. package/dist/indexer/scope-nodes.js +238 -0
  120. package/dist/indexer/scope-nodes.js.map +1 -0
  121. package/dist/indexer/scope.d.ts.map +1 -1
  122. package/dist/indexer/scope.js +70 -130
  123. package/dist/indexer/scope.js.map +1 -1
  124. package/dist/indexer/types.d.ts +7 -0
  125. package/dist/indexer/types.d.ts.map +1 -1
  126. package/dist/languages/definitions/c-family.d.ts +18 -4
  127. package/dist/languages/definitions/c-family.d.ts.map +1 -1
  128. package/dist/languages/definitions/c-family.js +51 -13
  129. package/dist/languages/definitions/c-family.js.map +1 -1
  130. package/dist/languages/definitions/c.d.ts.map +1 -1
  131. package/dist/languages/definitions/c.js +7 -43
  132. package/dist/languages/definitions/c.js.map +1 -1
  133. package/dist/languages/definitions/cpp.d.ts.map +1 -1
  134. package/dist/languages/definitions/cpp.js +15 -61
  135. package/dist/languages/definitions/cpp.js.map +1 -1
  136. package/dist/languages/definitions/csharp.d.ts.map +1 -1
  137. package/dist/languages/definitions/csharp.js +46 -52
  138. package/dist/languages/definitions/csharp.js.map +1 -1
  139. package/dist/languages/definitions/css-like.d.ts.map +1 -1
  140. package/dist/languages/definitions/css-like.js +13 -10
  141. package/dist/languages/definitions/css-like.js.map +1 -1
  142. package/dist/languages/definitions/go.d.ts.map +1 -1
  143. package/dist/languages/definitions/go.js +29 -42
  144. package/dist/languages/definitions/go.js.map +1 -1
  145. package/dist/languages/definitions/html.d.ts.map +1 -1
  146. package/dist/languages/definitions/html.js +15 -14
  147. package/dist/languages/definitions/html.js.map +1 -1
  148. package/dist/languages/definitions/java.d.ts.map +1 -1
  149. package/dist/languages/definitions/java.js +42 -48
  150. package/dist/languages/definitions/java.js.map +1 -1
  151. package/dist/languages/definitions/javascript.d.ts.map +1 -1
  152. package/dist/languages/definitions/javascript.js +26 -54
  153. package/dist/languages/definitions/javascript.js.map +1 -1
  154. package/dist/languages/definitions/js-family.d.ts +15 -1
  155. package/dist/languages/definitions/js-family.d.ts.map +1 -1
  156. package/dist/languages/definitions/js-family.js +51 -0
  157. package/dist/languages/definitions/js-family.js.map +1 -1
  158. package/dist/languages/definitions/kotlin.d.ts.map +1 -1
  159. package/dist/languages/definitions/kotlin.js +26 -43
  160. package/dist/languages/definitions/kotlin.js.map +1 -1
  161. package/dist/languages/definitions/php.d.ts.map +1 -1
  162. package/dist/languages/definitions/php.js +50 -60
  163. package/dist/languages/definitions/php.js.map +1 -1
  164. package/dist/languages/definitions/python.d.ts.map +1 -1
  165. package/dist/languages/definitions/python.js +23 -14
  166. package/dist/languages/definitions/python.js.map +1 -1
  167. package/dist/languages/definitions/ruby.d.ts.map +1 -1
  168. package/dist/languages/definitions/ruby.js +14 -17
  169. package/dist/languages/definitions/ruby.js.map +1 -1
  170. package/dist/languages/definitions/rust.d.ts.map +1 -1
  171. package/dist/languages/definitions/rust.js +30 -52
  172. package/dist/languages/definitions/rust.js.map +1 -1
  173. package/dist/languages/definitions/scss.d.ts.map +1 -1
  174. package/dist/languages/definitions/scss.js +33 -49
  175. package/dist/languages/definitions/scss.js.map +1 -1
  176. package/dist/languages/definitions/sfc-graph.d.ts +4 -0
  177. package/dist/languages/definitions/sfc-graph.d.ts.map +1 -0
  178. package/dist/languages/definitions/sfc-graph.js +16 -0
  179. package/dist/languages/definitions/sfc-graph.js.map +1 -0
  180. package/dist/languages/definitions/shared.d.ts +33 -0
  181. package/dist/languages/definitions/shared.d.ts.map +1 -0
  182. package/dist/languages/definitions/shared.js +63 -0
  183. package/dist/languages/definitions/shared.js.map +1 -0
  184. package/dist/languages/definitions/sql.d.ts.map +1 -1
  185. package/dist/languages/definitions/sql.js +1 -0
  186. package/dist/languages/definitions/sql.js.map +1 -1
  187. package/dist/languages/definitions/svelte.d.ts.map +1 -1
  188. package/dist/languages/definitions/svelte.js +2 -10
  189. package/dist/languages/definitions/svelte.js.map +1 -1
  190. package/dist/languages/definitions/swift.d.ts.map +1 -1
  191. package/dist/languages/definitions/swift.js +37 -31
  192. package/dist/languages/definitions/swift.js.map +1 -1
  193. package/dist/languages/definitions/typescript.d.ts.map +1 -1
  194. package/dist/languages/definitions/typescript.js +56 -90
  195. package/dist/languages/definitions/typescript.js.map +1 -1
  196. package/dist/languages/definitions/vue.d.ts.map +1 -1
  197. package/dist/languages/definitions/vue.js +2 -10
  198. package/dist/languages/definitions/vue.js.map +1 -1
  199. package/dist/languages/definitions/zig.d.ts.map +1 -1
  200. package/dist/languages/definitions/zig.js +9 -15
  201. package/dist/languages/definitions/zig.js.map +1 -1
  202. package/dist/languages/graph-captures.d.ts +40 -0
  203. package/dist/languages/graph-captures.d.ts.map +1 -0
  204. package/dist/languages/graph-captures.js +46 -0
  205. package/dist/languages/graph-captures.js.map +1 -0
  206. package/dist/languages/import-statement-parsers.d.ts +17 -0
  207. package/dist/languages/import-statement-parsers.d.ts.map +1 -1
  208. package/dist/languages/import-statement-parsers.js +108 -0
  209. package/dist/languages/import-statement-parsers.js.map +1 -1
  210. package/dist/languages/js-family.d.ts +2 -0
  211. package/dist/languages/js-family.d.ts.map +1 -1
  212. package/dist/languages/js-family.js +15 -6
  213. package/dist/languages/js-family.js.map +1 -1
  214. package/dist/languages/types.d.ts +4 -0
  215. package/dist/languages/types.d.ts.map +1 -1
  216. package/dist/languages/types.js +1 -1
  217. package/dist/languages/types.js.map +1 -1
  218. package/dist/languages.js +1 -1
  219. package/dist/languages.js.map +1 -1
  220. package/dist/native/contracts.d.ts +1 -1
  221. package/dist/native/contracts.d.ts.map +1 -1
  222. package/dist/native/js-bridge.d.ts +10 -0
  223. package/dist/native/js-bridge.d.ts.map +1 -1
  224. package/dist/native/js-bridge.js +10 -0
  225. package/dist/native/js-bridge.js.map +1 -1
  226. package/dist/native/native-backend-report.d.ts.map +1 -1
  227. package/dist/native/native-backend-report.js +2 -0
  228. package/dist/native/native-backend-report.js.map +1 -1
  229. package/dist/util/comments.d.ts +7 -7
  230. package/dist/util/comments.d.ts.map +1 -1
  231. package/dist/util/comments.js +15 -214
  232. package/dist/util/comments.js.map +1 -1
  233. package/dist/util/dynamic-import-tables.d.ts +88 -0
  234. package/dist/util/dynamic-import-tables.d.ts.map +1 -0
  235. package/dist/util/dynamic-import-tables.js +100 -0
  236. package/dist/util/dynamic-import-tables.js.map +1 -0
  237. package/dist/util/lines.d.ts.map +1 -1
  238. package/dist/util/lines.js +4 -1
  239. package/dist/util/lines.js.map +1 -1
  240. package/dist/util/member-access-tables.d.ts +72 -0
  241. package/dist/util/member-access-tables.d.ts.map +1 -0
  242. package/dist/util/member-access-tables.js +167 -0
  243. package/dist/util/member-access-tables.js.map +1 -0
  244. package/dist/util/member-access.d.ts +2 -0
  245. package/dist/util/member-access.d.ts.map +1 -1
  246. package/dist/util/member-access.js +61 -95
  247. package/dist/util/member-access.js.map +1 -1
  248. package/dist/util/paths.d.ts +4 -0
  249. package/dist/util/paths.d.ts.map +1 -1
  250. package/dist/util/paths.js +26 -0
  251. package/dist/util/paths.js.map +1 -1
  252. package/dist/util/project-files.js +1 -1
  253. package/dist/util/project-files.js.map +1 -1
  254. package/dist/util/resolution/cargo-targets.d.ts.map +1 -1
  255. package/dist/util/resolution/cargo-targets.js +17 -14
  256. package/dist/util/resolution/cargo-targets.js.map +1 -1
  257. package/dist/util/resolution/cpp.d.ts +6 -0
  258. package/dist/util/resolution/cpp.d.ts.map +1 -0
  259. package/dist/util/resolution/cpp.js +69 -0
  260. package/dist/util/resolution/cpp.js.map +1 -0
  261. package/dist/util/resolution/csharp.d.ts +4 -3
  262. package/dist/util/resolution/csharp.d.ts.map +1 -1
  263. package/dist/util/resolution/csharp.js +27 -113
  264. package/dist/util/resolution/csharp.js.map +1 -1
  265. package/dist/util/resolution/files.d.ts +6 -0
  266. package/dist/util/resolution/files.d.ts.map +1 -1
  267. package/dist/util/resolution/files.js +108 -4
  268. package/dist/util/resolution/files.js.map +1 -1
  269. package/dist/util/resolution/go.d.ts +1 -0
  270. package/dist/util/resolution/go.d.ts.map +1 -1
  271. package/dist/util/resolution/go.js +4 -3
  272. package/dist/util/resolution/go.js.map +1 -1
  273. package/dist/util/resolution/jvm.d.ts +3 -3
  274. package/dist/util/resolution/jvm.d.ts.map +1 -1
  275. package/dist/util/resolution/jvm.js +90 -54
  276. package/dist/util/resolution/jvm.js.map +1 -1
  277. package/dist/util/resolution/node.js +2 -2
  278. package/dist/util/resolution/node.js.map +1 -1
  279. package/dist/util/resolution/php-composer.d.ts.map +1 -1
  280. package/dist/util/resolution/php-composer.js +8 -7
  281. package/dist/util/resolution/php-composer.js.map +1 -1
  282. package/dist/util/resolution/php.d.ts.map +1 -1
  283. package/dist/util/resolution/php.js +30 -43
  284. package/dist/util/resolution/php.js.map +1 -1
  285. package/dist/util/resolution/project-symbols.d.ts +5 -7
  286. package/dist/util/resolution/project-symbols.d.ts.map +1 -1
  287. package/dist/util/resolution/project-symbols.js +23 -9
  288. package/dist/util/resolution/project-symbols.js.map +1 -1
  289. package/dist/util/resolution/python.d.ts.map +1 -1
  290. package/dist/util/resolution/python.js +107 -62
  291. package/dist/util/resolution/python.js.map +1 -1
  292. package/dist/util/resolution/rust.d.ts.map +1 -1
  293. package/dist/util/resolution/rust.js +45 -34
  294. package/dist/util/resolution/rust.js.map +1 -1
  295. package/dist/util/resolution/tsconfig.d.ts.map +1 -1
  296. package/dist/util/resolution/tsconfig.js +3 -9
  297. package/dist/util/resolution/tsconfig.js.map +1 -1
  298. package/dist/util/resolution-candidates.d.ts +5 -1
  299. package/dist/util/resolution-candidates.d.ts.map +1 -1
  300. package/dist/util/resolution-candidates.js +18 -0
  301. package/dist/util/resolution-candidates.js.map +1 -1
  302. package/dist/util/resolution.d.ts.map +1 -1
  303. package/dist/util/resolution.js +93 -49
  304. package/dist/util/resolution.js.map +1 -1
  305. package/dist/util/specifiers.d.ts +4 -10
  306. package/dist/util/specifiers.d.ts.map +1 -1
  307. package/dist/util/specifiers.js +131 -165
  308. package/dist/util/specifiers.js.map +1 -1
  309. package/dist/util/trivia-tables.d.ts +69 -0
  310. package/dist/util/trivia-tables.d.ts.map +1 -0
  311. package/dist/util/trivia-tables.js +186 -0
  312. package/dist/util/trivia-tables.js.map +1 -0
  313. package/dist/util/trivia.d.ts +24 -0
  314. package/dist/util/trivia.d.ts.map +1 -0
  315. package/dist/util/trivia.js +621 -0
  316. package/dist/util/trivia.js.map +1 -0
  317. package/dist/util.d.ts +1 -1
  318. package/dist/util.d.ts.map +1 -1
  319. package/dist/util.js +1 -1
  320. package/dist/util.js.map +1 -1
  321. package/dist/worker/native-extract-worker.d.ts.map +1 -1
  322. package/dist/worker/native-extract-worker.js +4 -4
  323. package/dist/worker/native-extract-worker.js.map +1 -1
  324. package/package.json +3 -3
@@ -1,4 +1,17 @@
1
1
  import { registerLanguage } from "../registry.js";
2
+ import { classifyByParentType, hasParentType, nodeTypeIn } from "./shared.js";
3
+ /** Parent types whose direct `identifier` child is a declared name. */
4
+ const KOTLIN_DECLARATION_NAME_PARENT_TYPES = [
5
+ "class_declaration",
6
+ "object_declaration",
7
+ "function_declaration",
8
+ "type_alias",
9
+ "variable_declaration",
10
+ "parameter",
11
+ "class_parameter",
12
+ "enum_entry",
13
+ "type_parameter",
14
+ ];
2
15
  export const KOTLIN_DEF = {
3
16
  id: "kotlin",
4
17
  extensions: [".kt", ".kts", ".ktm"],
@@ -45,7 +58,7 @@ export const KOTLIN_DEF = {
45
58
  },
46
59
  graph: {
47
60
  imports: `
48
- (import (qualified_identifier) @mod) @stmt
61
+ (import (qualified_identifier) @from) @stmt
49
62
  `,
50
63
  exports: `
51
64
  (source_file
@@ -88,50 +101,20 @@ export const KOTLIN_DEF = {
88
101
  propertyIdentifier: ["identifier"],
89
102
  memberExpression: "navigation_expression",
90
103
  },
91
- classifyDefinition: (node) => {
92
- const parent = node.parent;
93
- if (!parent)
94
- return "variable";
95
- if (parent.type === "class_declaration" || parent.type === "object_declaration")
96
- return "class";
97
- if (parent.type === "function_declaration")
98
- return "function";
99
- if (parent.type === "type_alias")
100
- return "type";
101
- return "variable";
102
- },
103
- isDeclarationName: (node) => {
104
- const parent = node.parent;
105
- if (!parent)
106
- return false;
107
- if (parent.type === "class_declaration" && node.type === "identifier")
108
- return true;
109
- if (parent.type === "object_declaration" && node.type === "identifier")
110
- return true;
111
- if (parent.type === "function_declaration" && node.type === "identifier")
112
- return true;
113
- if (parent.type === "type_alias" && node.type === "identifier")
114
- return true;
115
- if (parent.type === "variable_declaration" && node.type === "identifier")
116
- return true;
117
- if (parent.type === "parameter" && node.type === "identifier")
118
- return true;
119
- if (parent.type === "class_parameter" && node.type === "identifier")
120
- return true;
121
- if (parent.type === "enum_entry" && node.type === "identifier")
122
- return true;
123
- if (parent.type === "type_parameter" && node.type === "identifier")
124
- return true;
125
- return false;
126
- },
104
+ classifyDefinition: classifyByParentType({
105
+ class_declaration: "class",
106
+ object_declaration: "class",
107
+ function_declaration: "function",
108
+ type_alias: "type",
109
+ }),
110
+ // The Kotlin grammar exposes no `name` field on these declarations, so the declared
111
+ // name is identified by parent type with a plain `identifier` child.
112
+ isDeclarationName: (node) => node.type === "identifier" && hasParentType(node, KOTLIN_DECLARATION_NAME_PARENT_TYPES),
127
113
  scopeDeclarationNames: "all",
128
- createsFunctionScope: (node) => node.type === "function_declaration" || node.type === "anonymous_function" || node.type === "lambda_literal",
129
- createsBlockScope: (node) => node.type === "function_body" ||
130
- node.type === "class_body" ||
131
- node.type === "block" ||
132
- node.type === "catch_block" ||
133
- node.type === "finally_block",
114
+ createsFunctionScope: nodeTypeIn(["function_declaration", "anonymous_function", "lambda_literal"]),
115
+ createsBlockScope: nodeTypeIn(["function_body", "class_body", "block", "catch_block", "finally_block"]),
134
116
  supportsCrossModuleSymbols: true,
117
+ membersAreImplicitlyInScope: true,
135
118
  exportScopeBlockers: ["function_body", "lambda_literal", "anonymous_function"],
136
119
  };
137
120
  registerLanguage(KOTLIN_DEF);
@@ -1 +1 @@
1
- {"version":3,"file":"kotlin.js","sourceRoot":"","sources":["../../../src/languages/definitions/kotlin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kotlin.js","sourceRoot":"","sources":["../../../src/languages/definitions/kotlin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9E,uEAAuE;AACvE,MAAM,oCAAoC,GAAG;IAC3C,mBAAmB;IACnB,oBAAoB;IACpB,sBAAsB;IACtB,YAAY;IACZ,sBAAsB;IACtB,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,gBAAgB;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAuB;IAC5C,EAAE,EAAE,QAAQ;IACZ,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;IACnC,qBAAqB,EAAE,IAAI;IAC3B,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,mBAAmB;gBACzB,SAAS,EAAE,0BAA0B;gBACrC,SAAS,EAAE,OAAO;aACnB;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,SAAS,EAAE,0BAA0B;gBACrC,SAAS,EAAE,QAAQ;aACpB;YACD;gBACE,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,0BAA0B;gBACrC,SAAS,EAAE,UAAU;aACtB;YACD;gBACE,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,iDAAiD;gBAC5D,SAAS,EAAE,UAAU;aACtB;YACD;gBACE,IAAI,EAAE,YAAY;gBAClB,SAAS,EAAE,0BAA0B;gBACrC,SAAS,EAAE,MAAM;aAClB;SACF;QACD,WAAW,EAAE;YACX,eAAe;YACf,iBAAiB;YACjB,eAAe;YACf,iBAAiB;YACjB,oBAAoB;YACpB,gBAAgB;YAChB,aAAa;YACb,eAAe;SAChB;QACD,QAAQ,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;KAC5C;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;KAER;QACD,OAAO,EAAE;;;;;;;;;;;;;;;;;;KAkBR;QACD,MAAM,EAAE;;;;;;;;;;KAUP;QACD,cAAc,EAAE;;;;KAIf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,CAAC;QAC1B,kBAAkB,EAAE,CAAC,YAAY,CAAC;QAClC,gBAAgB,EAAE,uBAAuB;KAC1C;IACD,kBAAkB,EAAE,oBAAoB,CAAC;QACvC,iBAAiB,EAAE,OAAO;QAC1B,kBAAkB,EAAE,OAAO;QAC3B,oBAAoB,EAAE,UAAU;QAChC,UAAU,EAAE,MAAM;KACnB,CAAC;IACF,oFAAoF;IACpF,qEAAqE;IACrE,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,aAAa,CAAC,IAAI,EAAE,oCAAoC,CAAC;IACpH,qBAAqB,EAAE,KAAK;IAC5B,oBAAoB,EAAE,UAAU,CAAC,CAAC,sBAAsB,EAAE,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;IAClG,iBAAiB,EAAE,UAAU,CAAC,CAAC,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IACvG,0BAA0B,EAAE,IAAI;IAChC,2BAA2B,EAAE,IAAI;IACjC,mBAAmB,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,CAAC;CAC/E,CAAC;AACF,gBAAgB,CAAC,UAAU,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"php.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/php.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,eAAO,MAAM,OAAO,EAAE,kBAwJrB,CAAC"}
1
+ {"version":3,"file":"php.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/php.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAkBtD,eAAO,MAAM,OAAO,EAAE,kBAuIrB,CAAC"}
@@ -1,4 +1,18 @@
1
1
  import { registerLanguage } from "../registry.js";
2
+ import { classifyByParentType, isNameFieldOnParent } from "./shared.js";
3
+ // Include/require arguments are string | encapsed_string | binary_expression |
4
+ // variable_name | other expressions; no closed node-type list, so keep `(_)`.
5
+ const PHP_IMPORT_QUERY = `
6
+ (require_expression (_) @from) @stmt
7
+ (include_expression (_) @from) @stmt
8
+ (require_once_expression (_) @from) @stmt
9
+ (include_once_expression (_) @from) @stmt
10
+ (namespace_use_declaration (namespace_use_clause (qualified_name) @from alias: (name) @alias)) @stmt
11
+ (namespace_use_declaration (namespace_use_clause (qualified_name) @from !alias)) @stmt
12
+ (namespace_use_declaration (namespace_use_clause (name) @from alias: (name) @alias)) @stmt
13
+ (namespace_use_declaration (namespace_use_clause (name) @from !alias)) @stmt
14
+ (namespace_use_declaration (namespace_name) @from (namespace_use_group)) @stmt
15
+ `;
2
16
  export const PHP_DEF = {
3
17
  id: "php",
4
18
  extensions: [".php", ".phtml", ".php4", ".php8"],
@@ -59,13 +73,11 @@ export const PHP_DEF = {
59
73
  comments: ["comment"],
60
74
  },
61
75
  graph: {
62
- imports: `
63
- (require_expression) @stmt
64
- (include_expression) @stmt
65
- (require_once_expression) @stmt
66
- (include_once_expression) @stmt
67
- (namespace_use_declaration) @stmt
68
- `,
76
+ // Path-bearing nodes: include/require argument, `use Foo\Bar` qualified_name.
77
+ // Grouped `use Foo\{A}` has no single node for `Foo\A` (prefix + clause); the
78
+ // prefix is `@from`. Concatenated includes (`__DIR__ . "/x"`) capture the
79
+ // expression. PHP has no star-import token, so there is no `@wild`.
80
+ imports: PHP_IMPORT_QUERY,
69
81
  exports: `
70
82
  (namespace_definition name: (namespace_name) @name)
71
83
  (class_declaration name: (name) @name)
@@ -87,75 +99,53 @@ export const PHP_DEF = {
87
99
  (const_declaration (const_element . (name) @name))
88
100
  (property_element name: (variable_name) @name)
89
101
  `,
90
- importBindings: `
91
- (require_expression) @stmt
92
- (include_expression) @stmt
93
- (require_once_expression) @stmt
94
- (include_once_expression) @stmt
95
- (namespace_use_declaration) @stmt
96
- `,
102
+ importBindings: PHP_IMPORT_QUERY,
97
103
  },
98
104
  nodeTypes: {
99
105
  identifier: ["name", "variable_name", "namespace_name", "qualified_name", "relative_name"],
100
106
  propertyIdentifier: ["name"],
101
107
  memberExpression: "member_access_expression",
102
108
  },
103
- classifyDefinition: (node) => {
104
- const parentType = node.parent?.type;
105
- if (parentType === "class_declaration")
106
- return "class";
107
- if (parentType === "interface_declaration")
108
- return "interface";
109
- if (parentType === "trait_declaration")
110
- return "trait";
111
- if (parentType === "enum_declaration")
112
- return "type";
113
- if (parentType === "enum_case")
114
- return "constant";
115
- if (parentType === "function_definition")
116
- return "function";
117
- if (parentType === "method_declaration")
118
- return "method";
119
- if (parentType === "namespace_definition")
120
- return "namespace";
121
- if (parentType === "const_element" || parentType === "const_declaration") {
122
- return "constant";
123
- }
124
- return "variable";
125
- },
109
+ classifyDefinition: classifyByParentType({
110
+ class_declaration: "class",
111
+ interface_declaration: "interface",
112
+ trait_declaration: "trait",
113
+ enum_declaration: "type",
114
+ enum_case: "constant",
115
+ function_definition: "function",
116
+ method_declaration: "method",
117
+ namespace_definition: "namespace",
118
+ const_element: "constant",
119
+ const_declaration: "constant",
120
+ }),
126
121
  normalizeIdentifier: (name) => name.replace(/^\$/, ""),
127
- isDeclarationName: (node) => {
128
- const parent = node.parent;
129
- if (!parent)
130
- return false;
131
- const nameFieldOwnerTypes = new Set([
132
- "namespace_definition",
133
- "class_declaration",
134
- "interface_declaration",
135
- "trait_declaration",
136
- "enum_declaration",
137
- "enum_case",
138
- "function_definition",
139
- "method_declaration",
140
- ]);
141
- if (nameFieldOwnerTypes.has(parent.type)) {
142
- return parent.childForFieldName("name")?.id === node.id;
143
- }
122
+ isDeclarationName: (node) => isNameFieldOnParent(node, [
123
+ "namespace_definition",
124
+ "class_declaration",
125
+ "interface_declaration",
126
+ "trait_declaration",
127
+ "enum_declaration",
128
+ "enum_case",
129
+ "function_definition",
130
+ "method_declaration",
144
131
  // `property_element` exposes the declared name via the `name` field and any
145
132
  // initializer via `default_value`; field identity keeps a default value that
146
133
  // happens to be a bare variable reference from being misread as a declaration.
147
- if (parent.type === "property_element") {
148
- return parent.childForFieldName("name")?.id === node.id;
149
- }
134
+ "property_element",
135
+ ]) ||
150
136
  // `const_element` has no named fields (grammar: `seq($.name, '=', $.expression)`),
151
137
  // so the declared name is identified positionally as the first namedChild; a
152
138
  // value that is itself a bare `name` reference (e.g. `const X = SOME_CONST;`)
153
139
  // is the second namedChild and must not qualify.
154
- return parent.type === "const_element" && parent.namedChildren[0]?.id === node.id && node.type === "name";
155
- },
140
+ (node.parent?.type === "const_element" && node.parent.namedChildren[0]?.id === node.id && node.type === "name"),
156
141
  scopeDeclarationNames: (node) => node.type === "variable_name" && node.parent?.type === "property_element",
157
142
  createsFunctionScope: (node) => node.type === "function_definition" || node.type === "method_declaration",
158
- membersAreImplicitlyInScope: false,
143
+ // PHP `if`/`while`/function bodies are all `compound_statement`; without a block scope a
144
+ // nested declaration leaks into the enclosing scope.
145
+ createsBlockScope: (node) => node.type === "compound_statement",
146
+ // The exports query anchors unanchored, so a `function_definition` nested inside another
147
+ // function's `compound_statement` would otherwise publish as a module export.
148
+ exportScopeBlockers: ["compound_statement"],
159
149
  supportsCrossModuleSymbols: true,
160
150
  };
161
151
  registerLanguage(PHP_DEF);
@@ -1 +1 @@
1
- {"version":3,"file":"php.js","sourceRoot":"","sources":["../../../src/languages/definitions/php.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"php.js","sourceRoot":"","sources":["../../../src/languages/definitions/php.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/python.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA2BtE,6FAA6F;AAC7F,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CASrF;AAED,4FAA4F;AAC5F,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAQlF;AAED,eAAO,MAAM,UAAU,EAAE,kBAmMxB,CAAC"}
1
+ {"version":3,"file":"python.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/python.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA4BtE,6FAA6F;AAC7F,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CASrF;AAED,4FAA4F;AAC5F,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAQlF;AAqBD,eAAO,MAAM,UAAU,EAAE,kBA0LxB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { registerLanguage } from "../registry.js";
2
+ import { isNameFieldOnParent, nodeTypeIn } from "./shared.js";
2
3
  import { hasNonAsciiCodePoint } from "../../util/identifiers.js";
3
4
  function isTypeAliasLeftName(node) {
4
5
  const parent = node.parent;
@@ -47,6 +48,23 @@ export function isPythonInstanceAttributeDeclaration(node) {
47
48
  }
48
49
  return false;
49
50
  }
51
+ const PYTHON_GRAPH_IMPORT_QUERY = `
52
+ (import_statement name: (dotted_name) @from) @stmt
53
+ (import_statement name: (aliased_import name: (dotted_name) @from alias: (identifier) @alias)) @stmt
54
+ (import_from_statement module_name: (dotted_name) @from (wildcard_import)* @wild) @stmt
55
+ (import_from_statement (relative_import) @from (wildcard_import)* @wild) @stmt
56
+ ;; tree-sitter-python's future_import_statement has no named node for the
57
+ ;; \`__future__\` module; only the imported names are named children.
58
+ (future_import_statement) @stmt
59
+ `;
60
+ // One match per statement so the native binding path that re-reads @stmt text
61
+ // does not duplicate. `@from` still sits on the path-bearing node.
62
+ const PYTHON_BINDING_QUERY = `
63
+ (import_statement . (_) @from) @stmt
64
+ (import_from_statement module_name: (dotted_name) @from) @stmt
65
+ (import_from_statement (relative_import) @from) @stmt
66
+ (future_import_statement) @stmt
67
+ `;
50
68
  export const PYTHON_DEF = {
51
69
  id: "python",
52
70
  extensions: [".py", ".pyi", ".pyw"],
@@ -96,11 +114,7 @@ export const PYTHON_DEF = {
96
114
  comments: ["comment"],
97
115
  },
98
116
  graph: {
99
- imports: `
100
- (import_statement) @stmt
101
- (import_from_statement) @stmt
102
- (future_import_statement) @stmt
103
- `,
117
+ imports: PYTHON_GRAPH_IMPORT_QUERY,
104
118
  // NOTE: These __all__ queries only capture module-level assignments.
105
119
  // Dynamic __all__ definitions inside functions, conditionals, or loops
106
120
  // (e.g., `if PY3: __all__ = [...]`) are not detected by these patterns.
@@ -171,11 +185,7 @@ export const PYTHON_DEF = {
171
185
  ;; \`case [head, *tail]:\` binds the capture after the splat.
172
186
  (splat_pattern (identifier) @name)
173
187
  `,
174
- importBindings: `
175
- (import_statement) @stmt
176
- (import_from_statement) @stmt
177
- (future_import_statement) @stmt
178
- `,
188
+ importBindings: PYTHON_BINDING_QUERY,
179
189
  },
180
190
  nodeTypes: {
181
191
  identifier: ["identifier"],
@@ -220,7 +230,7 @@ export const PYTHON_DEF = {
220
230
  if (t === "splat_pattern")
221
231
  return true;
222
232
  if (t === "named_expression")
223
- return parent?.childForFieldName("name")?.id === node.id;
233
+ return isNameFieldOnParent(node, ["named_expression"]);
224
234
  if (t === "pattern_list" || t === "tuple_pattern")
225
235
  return true;
226
236
  // `assignment` exposes the target via the `left` field; a bare-identifier
@@ -239,9 +249,8 @@ export const PYTHON_DEF = {
239
249
  return true;
240
250
  return !!t && ["function_definition", "class_definition"].includes(t);
241
251
  },
242
- createsBlockScope: (n) => n.type === "module" || n.type === "block",
243
- createsFunctionScope: (n) => n.type === "function_definition" || n.type === "lambda",
244
- membersAreImplicitlyInScope: false,
252
+ createsBlockScope: nodeTypeIn(["module", "block"]),
253
+ createsFunctionScope: nodeTypeIn(["function_definition", "lambda"]),
245
254
  supportsCrossModuleSymbols: true,
246
255
  // A function body and a class body are both `block`, so only the function form blocks exports.
247
256
  exportScopeBlockers: ["function_definition>block"],
@@ -1 +1 @@
1
- {"version":3,"file":"python.js","sourceRoot":"","sources":["../../../src/languages/definitions/python.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"python.js","sourceRoot":"","sources":["../../../src/languages/definitions/python.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,SAAS,mBAAmB,CAAC,IAAoB;IAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,OAAO,IAAI,EAAE,IAAI,KAAK,sBAAsB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;IACnG,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC;QAC/B,MAAM,IAAI,GAAG,QAAQ,EAAE,MAAM,CAAC;QAC9B,OAAO,CACL,QAAQ,EAAE,IAAI,KAAK,MAAM;YACzB,IAAI,EAAE,IAAI,KAAK,sBAAsB;YACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,QAAQ,CAAC,EAAE,CACnD,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAY;IAChD,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC;AAC3C,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,uCAAuC,CAAC,IAAoB;IAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;IACzB,IAAI,IAAI,EAAE,IAAI,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAC/B,IAAI,UAAU,EAAE,IAAI,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC;IACpD,OAAO,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,oCAAoC,CAAC,IAAoB;IACvE,IAAI,CAAC,uCAAuC,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;IAC1B,OAAO,OAAO,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB;YAAE,OAAO,IAAI,CAAC;QACrD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAC3B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,yBAAyB,GAAG;;;;;;;;KAQ7B,CAAC;AAEN,8EAA8E;AAC9E,mEAAmE;AACnE,MAAM,oBAAoB,GAAG;;;;;KAKxB,CAAC;AAEN,MAAM,CAAC,MAAM,UAAU,GAAuB;IAC5C,EAAE,EAAE,QAAQ;IACZ,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC;IACnC,qBAAqB,EAAE,IAAI;IAC3B,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,gCAAgC;gBAC3C,SAAS,EAAE,OAAO;aACnB;YACD;gBACE,IAAI,EAAE,qBAAqB;gBAC3B,SAAS,EAAE,gCAAgC;gBAC3C,SAAS,EAAE,UAAU;aACtB;YAED,6EAA6E;YAC7E;gBACE,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,2BAA2B;gBACtC,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,QAAQ;aACrB;YAED,wBAAwB;YACxB;gBACE,IAAI,EAAE,YAAY;gBAClB,SAAS,EACP,mHAAmH;gBACrH,SAAS,EAAE,YAAY;aACxB;YACD;gBACE,IAAI,EAAE,sBAAsB;gBAC5B,SAAS,EAAE,iFAAiF;gBAC5F,SAAS,EAAE,MAAM;aAClB;YAED,UAAU;YACV,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,EAAE;YAClD,EAAE,IAAI,EAAE,uBAAuB,EAAE,SAAS,EAAE,SAAS,EAAE;SACxD;QACD,WAAW,EAAE;YACX,cAAc;YACd,eAAe;YACf,iBAAiB;YACjB,eAAe;YACf,gBAAgB;YAChB,iBAAiB;SAClB;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,KAAK,EAAE;QACL,OAAO,EAAE,yBAAyB;QAClC,qEAAqE;QACrE,uEAAuE;QACvE,wEAAwE;QACxE,mEAAmE;QACnE,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCR;QACD,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCP;QACD,cAAc,EAAE,oBAAoB;KACrC;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,CAAC;QAC1B,kBAAkB,EAAE,CAAC,YAAY,CAAC;QAClC,gBAAgB,EAAE,WAAW;KAC9B;IACD,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE;QACxB,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;QACzB,IAAI,CAAC,KAAK,qBAAqB;YAAE,OAAO,UAAU,CAAC;QACnD,IAAI,CAAC,KAAK,kBAAkB;YAAE,OAAO,OAAO,CAAC;QAC7C,IAAI,mBAAmB,CAAC,CAAC,CAAC;YAAE,OAAO,MAAM,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;QACrC,OAAO,CACL,UAAU,KAAK,cAAc;YAC7B,UAAU,KAAK,YAAY;YAC3B,UAAU,KAAK,mBAAmB;YAClC,UAAU,KAAK,eAAe;YAC9B,UAAU,KAAK,aAAa;YAC5B,UAAU,KAAK,kBAAkB;YACjC,UAAU,KAAK,cAAc;YAC7B,UAAU,KAAK,eAAe;YAC9B,UAAU,KAAK,MAAM;YACrB,UAAU,KAAK,cAAc,CAC9B,CAAC;IACJ,CAAC;IACD,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC;QACvB,IACE,CAAC,KAAK,aAAa;YACnB,MAAM;YACN,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,cAAc,CAAC;YAErF,OAAO,IAAI,CAAC;QACd,IAAI,CAAC,KAAK,mBAAmB;YAAE,OAAO,IAAI,CAAC;QAC3C,IAAI,CAAC,KAAK,YAAY;YAAE,OAAO,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;QAC1E,IAAI,CAAC,KAAK,eAAe;YAAE,OAAO,IAAI,CAAC;QACvC,IAAI,CAAC,KAAK,kBAAkB;YAAE,OAAO,mBAAmB,CAAC,IAAI,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACrF,IAAI,CAAC,KAAK,cAAc,IAAI,CAAC,KAAK,eAAe;YAAE,OAAO,IAAI,CAAC;QAC/D,0EAA0E;QAC1E,oEAAoE;QACpE,qEAAqE;QACrE,eAAe;QACf,IAAI,uCAAuC,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC/D,IAAI,CAAC,KAAK,YAAY;YAAE,OAAO,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACjF,uEAAuE;QACvE,0EAA0E;QAC1E,IAAI,CAAC,KAAK,gBAAgB;YAAE,OAAO,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtF,IAAI,mBAAmB,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC3C,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,iBAAiB,EAAE,UAAU,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,oBAAoB,EAAE,UAAU,CAAC,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IACnE,0BAA0B,EAAE,IAAI;IAChC,+FAA+F;IAC/F,mBAAmB,EAAE,CAAC,2BAA2B,CAAC;IAClD,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;CAC5F,CAAC;AACF,gBAAgB,CAAC,UAAU,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ruby.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/ruby.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,eAAO,MAAM,QAAQ,EAAE,kBAoFtB,CAAC"}
1
+ {"version":3,"file":"ruby.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/ruby.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAItD,eAAO,MAAM,QAAQ,EAAE,kBAqFtB,CAAC"}
@@ -1,6 +1,8 @@
1
1
  import { registerLanguage } from "../registry.js";
2
+ import { isNameFieldOnParent } from "./shared.js";
2
3
  export const RUBY_DEF = {
3
4
  id: "ruby",
5
+ usesQueryDrivenLocals: true,
4
6
  extensions: [".rb", ".rbw", ".rake", ".gemspec"],
5
7
  structure: {
6
8
  blocks: [
@@ -30,7 +32,7 @@ export const RUBY_DEF = {
30
32
  },
31
33
  graph: {
32
34
  imports: `
33
- (call method: (identifier) @method arguments: (argument_list (string (string_content) @mod)) (#match? @method "^(require|require_relative|load|autoload)$")) @stmt
35
+ (call method: (identifier) @method arguments: (argument_list (string (string_content) @from)) (#match? @method "^(require|require_relative|load|autoload)$")) @stmt
34
36
  `,
35
37
  exports: `
36
38
  (class name: [(constant) (scope_resolution)] @name)
@@ -56,7 +58,16 @@ export const RUBY_DEF = {
56
58
  memberExpression: "call",
57
59
  },
58
60
  supportsCrossModuleSymbols: true,
61
+ membersAreImplicitlyInScope: true,
62
+ // Query-driven locals capture the declared name inside a `class`, `module`, `method`, or
63
+ // `singleton_method`, so classification must read the parent type the same way the scope
64
+ // walker's structural handling does.
59
65
  classifyDefinition: (node) => {
66
+ const parentType = node.parent?.type;
67
+ if (parentType === "class" || parentType === "module")
68
+ return "class";
69
+ if (parentType === "method" || parentType === "singleton_method")
70
+ return "method";
60
71
  const assignment = node.parent;
61
72
  const value = assignment?.childForFieldName("right");
62
73
  if (assignment?.type === "assignment" &&
@@ -71,22 +82,8 @@ export const RUBY_DEF = {
71
82
  scopeDeclarationNames: (node) => node.type === "constant" && node.parent?.type === "assignment",
72
83
  createsFunctionScope: (node) => node.type === "method" || node.type === "singleton_method",
73
84
  createsBlockScope: (node) => node.type === "do_block" || node.type === "block",
74
- isDeclarationName: (node) => {
75
- const p = node.parent;
76
- if (!p)
77
- return false;
78
- if (p.type === "class" && p.childForFieldName("name")?.id === node.id)
79
- return true;
80
- if (p.type === "module" && p.childForFieldName("name")?.id === node.id)
81
- return true;
82
- if (p.type === "method" && p.childForFieldName("name")?.id === node.id)
83
- return true;
84
- if (p.type === "singleton_method" && p.childForFieldName("name")?.id === node.id)
85
- return true;
86
- if (p.type === "assignment" && p.childForFieldName("left")?.id === node.id)
87
- return true;
88
- return false;
89
- },
85
+ isDeclarationName: (node) => isNameFieldOnParent(node, ["class", "module", "method", "singleton_method"]) ||
86
+ isNameFieldOnParent(node, ["assignment"], "left"),
90
87
  };
91
88
  registerLanguage(RUBY_DEF);
92
89
  //# sourceMappingURL=ruby.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ruby.js","sourceRoot":"","sources":["../../../src/languages/definitions/ruby.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ruby.js","sourceRoot":"","sources":["../../../src/languages/definitions/ruby.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"rust.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/rust.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAItD,eAAO,MAAM,QAAQ,EAAE,kBA+ItB,CAAC"}
1
+ {"version":3,"file":"rust.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/rust.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAKtD,eAAO,MAAM,QAAQ,EAAE,kBAwItB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { registerLanguage } from "../registry.js";
2
+ import { classifyByParentType, isNameFieldOnParent, nodeTypeIn } from "./shared.js";
2
3
  import { hasNonAsciiCodePoint } from "../../util/identifiers.js";
3
4
  export const RUST_DEF = {
4
5
  id: "rust",
@@ -42,9 +43,9 @@ export const RUST_DEF = {
42
43
  },
43
44
  graph: {
44
45
  imports: `
45
- (mod_item name: (identifier) @mod) @stmt
46
- (extern_crate_declaration name: (identifier) @mod) @stmt
47
- (use_declaration argument: (_) @mod) @stmt
46
+ (mod_item name: (identifier) @from) @stmt
47
+ (extern_crate_declaration name: (identifier) @from) @stmt
48
+ (use_declaration argument: (_) @from) @stmt
48
49
  `,
49
50
  exports: `
50
51
  (function_item name: (identifier) @name) @stmt
@@ -94,6 +95,7 @@ export const RUST_DEF = {
94
95
  (use_declaration argument: (use_as_clause path: (identifier) @from alias: (identifier) @alias)) @stmt
95
96
  (use_declaration argument: (use_as_clause path: (scoped_identifier path: (_) @from name: (identifier) @iname) alias: (identifier) @alias)) @stmt
96
97
  (use_declaration argument: (scoped_identifier path: (_) @from name: (identifier) @iname)) @stmt
98
+ (use_declaration argument: (use_wildcard) @from @wild) @stmt
97
99
  (use_declaration argument: (identifier) @from) @stmt
98
100
  (use_declaration argument: (scoped_use_list path: (_) @from list: (use_list (identifier) @iname))) @stmt
99
101
  ;; Aliased members inside a group (\`use foo::{Bar as Baz}\`): import
@@ -108,55 +110,31 @@ export const RUST_DEF = {
108
110
  supportsCrossModuleSymbols: true,
109
111
  exportScopeBlockers: ["block"],
110
112
  scopeDeclarationNames: (node) => node.parent?.type === "macro_definition",
111
- classifyDefinition: (node) => {
112
- const parent = node.parent;
113
- if (!parent)
114
- return "variable";
115
- if (parent.type === "function_item" ||
116
- parent.type === "function_signature_item" ||
117
- parent.type === "macro_definition")
118
- return "function";
119
- if (parent.type === "enum_item" || parent.type === "type_item" || parent.type === "associated_type")
120
- return "type";
121
- if (parent.type === "struct_item" || parent.type === "trait_item")
122
- return "class";
123
- return "variable";
124
- },
125
- createsFunctionScope: (node) => node.type === "function_item",
126
- createsBlockScope: (node) => node.type === "block",
127
- membersAreImplicitlyInScope: false,
128
- isDeclarationName: (node) => {
129
- const p = node.parent;
130
- if (!p)
131
- return false;
132
- if (p.type === "function_item" && p.childForFieldName("name")?.id === node.id)
133
- return true;
134
- if (p.type === "function_signature_item" && p.childForFieldName("name")?.id === node.id)
135
- return true;
136
- if (p.type === "struct_item" && p.childForFieldName("name")?.id === node.id)
137
- return true;
138
- if (p.type === "trait_item" && p.childForFieldName("name")?.id === node.id)
139
- return true;
140
- if (p.type === "type_item" && p.childForFieldName("name")?.id === node.id)
141
- return true;
142
- if (p.type === "associated_type" && p.childForFieldName("name")?.id === node.id)
143
- return true;
144
- if (p.type === "enum_item" && p.childForFieldName("name")?.id === node.id)
145
- return true;
146
- if (p.type === "enum_variant" && p.childForFieldName("name")?.id === node.id)
147
- return true;
148
- if (p.type === "const_item" && p.childForFieldName("name")?.id === node.id)
149
- return true;
150
- if (p.type === "static_item" && p.childForFieldName("name")?.id === node.id)
151
- return true;
152
- if (p.type === "macro_definition" && p.childForFieldName("name")?.id === node.id)
153
- return true;
154
- if (p.type === "let_declaration" && p.childForFieldName("pattern")?.id === node.id)
155
- return true;
156
- if (p.type === "parameter" && p.childForFieldName("pattern")?.id === node.id)
157
- return true;
158
- return false;
159
- },
113
+ classifyDefinition: classifyByParentType({
114
+ function_item: "function",
115
+ function_signature_item: "function",
116
+ macro_definition: "function",
117
+ enum_item: "type",
118
+ type_item: "type",
119
+ associated_type: "type",
120
+ struct_item: "class",
121
+ trait_item: "class",
122
+ }),
123
+ createsFunctionScope: nodeTypeIn(["function_item"]),
124
+ createsBlockScope: nodeTypeIn(["block"]),
125
+ isDeclarationName: (node) => isNameFieldOnParent(node, [
126
+ "function_item",
127
+ "function_signature_item",
128
+ "struct_item",
129
+ "trait_item",
130
+ "type_item",
131
+ "associated_type",
132
+ "enum_item",
133
+ "enum_variant",
134
+ "const_item",
135
+ "static_item",
136
+ "macro_definition",
137
+ ]) || isNameFieldOnParent(node, ["let_declaration", "parameter"], "pattern"),
160
138
  normalizeIdentifier: (name) => (hasNonAsciiCodePoint(name) ? name.normalize("NFC") : name),
161
139
  };
162
140
  registerLanguage(RUST_DEF);
@@ -1 +1 @@
1
- {"version":3,"file":"rust.js","sourceRoot":"","sources":["../../../src/languages/definitions/rust.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,CAAC,MAAM,QAAQ,GAAuB;IAC1C,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,qBAAqB,EAAE,IAAI;IAC3B,SAAS,EAAE;QACT,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,eAAe;gBACrB,SAAS,EAAE,gCAAgC;gBAC3C,SAAS,EAAE,UAAU;aACtB;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,qCAAqC;gBAChD,SAAS,EAAE,QAAQ;aACpB;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE,qCAAqC;gBAChD,SAAS,EAAE,MAAM;aAClB;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE,qCAAqC;gBAChD,SAAS,EAAE,MAAM;aAClB;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,gCAAgC;gBAC3C,SAAS,EAAE,QAAQ;aACpB;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,gCAAgC;gBAC3C,SAAS,EAAE,OAAO;aACnB;SACF;QACD,WAAW,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC;QAC3G,QAAQ,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;KAC5C;IACD,KAAK,EAAE;QACL,OAAO,EAAE;;;;KAIR;QACD,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;KAyBR;QACD,MAAM,EAAE;;;;;;;;;;;;;;KAcP;QACD,cAAc,EAAE;;;;;;;;;;;;KAYf;KACF;IACD,SAAS,EAAE;QACT,UAAU,EAAE,CAAC,YAAY,EAAE,iBAAiB,CAAC;QAC7C,gBAAgB,EAAE,kBAAkB;KACrC;IACD,0BAA0B,EAAE,IAAI;IAChC,mBAAmB,EAAE,CAAC,OAAO,CAAC;IAC9B,qBAAqB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,kBAAkB;IACzE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAC/B,IACE,MAAM,CAAC,IAAI,KAAK,eAAe;YAC/B,MAAM,CAAC,IAAI,KAAK,yBAAyB;YACzC,MAAM,CAAC,IAAI,KAAK,kBAAkB;YAElC,OAAO,UAAU,CAAC;QACpB,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,IAAI,KAAK,iBAAiB;YAAE,OAAO,MAAM,CAAC;QACnH,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY;YAAE,OAAO,OAAO,CAAC;QAClF,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe;IAC7D,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO;IAClD,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACtB,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACrB,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC3F,IAAI,CAAC,CAAC,IAAI,KAAK,yBAAyB,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACrG,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACzF,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACxF,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACvF,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC7F,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACvF,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC1F,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACxF,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACzF,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,IAAI,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC9F,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAChG,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC1F,OAAO,KAAK,CAAC;IACf,CAAC;IACD,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;CAC3F,CAAC;AACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC"}
1
+ {"version":3,"file":"rust.js","sourceRoot":"","sources":["../../../src/languages/definitions/rust.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"scss.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/scss.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtD,eAAO,MAAM,QAAQ,EAAE,kBA0EtB,CAAC"}
1
+ {"version":3,"file":"scss.d.ts","sourceRoot":"","sources":["../../../src/languages/definitions/scss.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAyBtD,eAAO,MAAM,QAAQ,EAAE,kBA4CtB,CAAC"}