Project import generated by Copybara. (#23)

pqn · Copybara Bot · web-flow · commit 01ce002a4577 · 2023-09-19T12:17:03.000-07:00
GitOrigin-RevId: 6cffcb49ccb7a4b1f8c40f7c8c84a34c79520971

Co-authored-by: Copybara Bot &lt;copybara@exafunction.com&gt;
diff --git a/README.md b/README.md
@@ -73,22 +73,23 @@ Queries try to follow the [conventions established by tree-sitter.](https://tree
 
 Most captures also include documentation as `@doc`. `@definition.function` and `@definition.method` also capture `@codeium.parameters`.
 
-| Top-level capture       | Python | TypeScript | JavaScript | Go  | Java | C++    | PHP |
-| ----------------------  | ------ | ---------- | ---------- | --- | ---- | ------ | --- |
-| `@definition.class`     | ✅     | ✅         | ✅         | ✅  | ✅   | ✅     | ✅  |
-| `@definition.function`  | ✅     | ✅[^3]     | ✅         | ✅  | N/A  | ✅     | ✅  |
-| `@definition.method`    | ✅[^1] | ✅[^3]     | ✅         | ✅  | ✅   | ✅[^1] | ✅  |
-| `@definition.interface` | N/A    | ✅         | N/A        | ✅  | ✅   | N/A    | ✅  |
-| `@definition.namespace` | N/A    | ✅         | N/A        | N/A | N/A  | ✅     | ✅  |
-| `@definition.module`    | N/A    | ✅         | N/A        | N/A | N/A  | ❌     | N/A |
-| `@definition.type`      | N/A    | ✅         | N/A        | ✅  | N/A  | ❌     | ❌  |
-| `@definition.constant`  | ❌     | ❌         | ❌         | ❌  | ❌   | ❌     | ❌  |
-| `@definition.enum`      | ❌     | ❌         | ❌         | ❌  | ❌   | ❌     | ❌  |
-| `@definition.import`    | ✅     | ✅         | ✅         | ❌  | ❌   | ❌     | N/A |
-| `@definition.include`   | N/A    | N/A        | N/A        | N/A | N/A  | ❌     | ❌  |
-| `@definition.package`   | N/A    | N/A        | N/A        | ✅  | ✅   | N/A    | N/A |
-| `@reference.call`       | ✅     | ✅         | ✅         | ✅  | ❌   | ❌     | ❌  |
-| `@reference.class`      | ✅[^2] | ✅         | ✅         | ✅  | ❌   | ❌     | ❌  |
+| Top-level capture         | Python | TypeScript | JavaScript | Go  | Java | C++    | PHP | Ruby |
+| ------------------------- | ------ | ---------- | ---------- | --- | ---- | ------ | --- | ---- |
+| `@definition.class`       | ✅     | ✅         | ✅         | ✅  | ✅   | ✅     | ✅  | ✅  |
+| `@definition.function`    | ✅     | ✅[^3]     | ✅         | ✅  | N/A  | ✅     | ✅  | N/A |
+| `@definition.method`      | ✅[^1] | ✅[^3]     | ✅         | ✅  | ✅   | ✅[^1] | ✅  | ✅  |
+| `@definition.constructor` | ✅     | ✅         | ✅         | N/A | ❌   | ❌     | ❌  | ❌  |
+| `@definition.interface`   | N/A    | ✅         | N/A        | ✅  | ✅   | N/A    | ✅  | ❌  |
+| `@definition.namespace`   | N/A    | ✅         | N/A        | N/A | N/A  | ✅     | ✅  | N/A |
+| `@definition.module`      | N/A    | ✅         | N/A        | N/A | N/A  | ❌     | N/A | ✅  |
+| `@definition.type`        | N/A    | ✅         | N/A        | ✅  | N/A  | ❌     | ❌  | N/A |
+| `@definition.constant`    | ❌     | ❌         | ❌         | ❌  | ❌   | ❌     | ❌  | ❌  |
+| `@definition.enum`        | ❌     | ❌         | ❌         | ❌  | ❌   | ❌     | ❌  | N/A |
+| `@definition.import`      | ✅     | ✅         | ✅         | ❌  | ❌   | ❌     | N/A | ✅  |
+| `@definition.include`     | N/A    | N/A        | N/A        | N/A | N/A  | ❌     | ❌  | N/A |
+| `@definition.package`     | N/A    | N/A        | N/A        | ✅  | ✅   | N/A    | N/A | N/A |
+| `@reference.call`         | ✅     | ✅         | ✅         | ✅  | ❌   | ❌     | ❌  | ✅ |
+| `@reference.class`        | ✅[^2] | ✅         | ✅         | ✅  | ❌   | ❌     | ❌  | ❌ |
 
 | Language | Supported injections   |
 | -------- | ---------------------- |
diff --git a/download_parse.sh b/download_parse.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
-VERSION="v0.0.12"
+VERSION="v0.0.13"
 rm -f parse.gz parse
 curl -Lo parse.gz "https://github.com/Exafunction/codeium-parse/releases/download/$VERSION/parse.gz"
 gzip -d parse.gz
diff --git a/goldens/test.cpp.golden b/goldens/test.cpp.golden
@@ -30,6 +30,10 @@ Name: Foo
 Definition (definition.class):
 class Foo {
  public:
+  // Constructor comment.
+  Foo() = default;
+  // Constructor comment.
+  explicit Foo(int /*unused*/) {}
   // foo
   // foo2
   void foo() {
diff --git a/goldens/test.go.golden b/goldens/test.go.golden
@@ -56,7 +56,7 @@ Return type: string
 Definition (definition.method):
 func (p Pattern0) Method2(a string) string {
 	Pattern2()
-	s := &Pattern0{}
+	s := &Pattern0{a: "foo"}
 	s.Method("")
 	((*Pattern0)(s)).Method("")
 	var s2 any
@@ -72,8 +72,9 @@ Reference (reference.call):
 Pattern2()
 
 Name: Pattern0
+Parameters: {a: "foo"}
 Reference (reference.class):
-Pattern0{}
+Pattern0{a: "foo"}
 
 Name: Method
 Parent: s
diff --git a/goldens/test.java.golden b/goldens/test.java.golden
@@ -9,6 +9,8 @@ Doc:
 // Class Foo.
 Definition (definition.class):
 public class Foo {
+  // Constructor comment.
+  public Foo() {}
   /** Foo1. */
   static public void foo1(int x) {}
 }
diff --git a/goldens/test.js.golden b/goldens/test.js.golden
@@ -44,6 +44,13 @@ class Pattern1a {
   }
 }
 
+Name: constructor
+Parameters: ()
+Definition (definition.constructor):
+constructor() {}
+Lineage: [Pattern1a]
+Lineage types: [class]
+
 Name: pattern0
 Parameters: (param1)
 Doc:
diff --git a/goldens/test.php.golden b/goldens/test.php.golden
@@ -35,6 +35,8 @@ Doc:
 Definition (definition.class):
 class FooClass implements FooInterface
 {
+    // Constructor comment.
+    function __construct() {}
     /**
      * @param mixed $numbers
      * @return string
@@ -46,6 +48,15 @@ class FooClass implements FooInterface
 Lineage: [test]
 Lineage types: [namespace]
 
+Name: __construct
+Parameters: ()
+Doc:
+// Constructor comment.
+Definition (definition.method):
+function __construct() {}
+Lineage: [test FooClass]
+Lineage types: [namespace class]
+
 Name: encode
 Parameters: (...$numbers)
 Doc:
diff --git a/goldens/test.py.golden b/goldens/test.py.golden
@@ -32,6 +32,16 @@ Doc:
 Definition (definition.class):
 class Pattern0:
     """Pattern 0 docstring."""
+    def __init__(self):
+        pass
+
+Name: __init__
+Parameters: (self)
+Definition (definition.constructor):
+def __init__(self):
+        pass
+Lineage: [Pattern0]
+Lineage types: [class]
 
 Name: Pattern0NoDoc
 Definition (definition.class):
diff --git a/goldens/test.rb.golden b/goldens/test.rb.golden
@@ -8,6 +8,8 @@ Doc:
 #  nothing strange here
 Declaration (definition.class):
 class SomeClass
+  def initialize
+  end
   # In ruby, the parentheses can be omitted in many circumstances
   # This is probably a job for the AST, but we'll add a test here anyway
   def empty_parens()
@@ -17,6 +19,9 @@ end
 
 Name: empty_parens
 Parameters: ()
+Doc:
+# In ruby, the parentheses can be omitted in many circumstances
+# This is probably a job for the AST, but we'll add a test here anyway
 Definition (definition.method):
 def empty_parens()
     "Nice"
diff --git a/goldens/test.tsx.golden b/goldens/test.tsx.golden
@@ -111,12 +111,23 @@ Doc:
 /** Foo comment. */
 Definition (definition.class):
 class Foo {
+    // Constructor comment.
+    constructor() {}
     /** methodSignature comment. */
     methodSignature(): void;
     /** methodSignature comment. */
     methodSignature(): void {}
 }
 
+Name: constructor
+Parameters: ()
+Doc:
+// Constructor comment.
+Definition (definition.constructor):
+constructor() {}
+Lineage: [Foo]
+Lineage types: [class]
+
 Name: methodSignature
 Parameters: ()
 Return type: void
diff --git a/queries/go_tags.scm b/queries/go_tags.scm
@@ -72,7 +72,8 @@
     (qualified_type
       package: (package_identifier) @parent
       name: (type_identifier) @name)
-  ]) @reference.class
+  ]
+  (literal_value) @codeium.parameters) @reference.class
 
 ;; 6. Pattern 3 from tags.scm.
 ;; Restricted to just type aliases.
diff --git a/queries/java_class_fields.scm b/queries/java_class_fields.scm
@@ -7,7 +7,7 @@
     (class_body
         ([
             (constructor_declaration)
-        ]) @codeium.constructor
+        ]) @definition.constructor
     )
 )
 
@@ -21,6 +21,6 @@
         ([
             (constructor_declaration)
             (compact_constructor_declaration)
-        ]) @codeium.constructor
+        ]) @definition.constructor
     )
 )
diff --git a/queries/javascript_class_fields.scm b/queries/javascript_class_fields.scm
@@ -5,15 +5,3 @@
         ]) @field
     )
 )
-
-(
-  (comment)* @doc
-  .
-  (_
-    name: (property_identifier) @name
-    parameters: (formal_parameters) @codeium.parameters
-    body: (_)? @body) @codeium.constructor
-  (#eq? @name "constructor")
-  (#has-type? @codeium.constructor method_definition method_signature abstract_method_signature)
-  (#select-adjacent! @doc @codeium.constructor)
-)
diff --git a/queries/javascript_constructors.scm b/queries/javascript_constructors.scm
@@ -0,0 +1,11 @@
+(
+  (comment)* @doc
+  .
+  (_
+    name: (property_identifier) @name
+    parameters: (formal_parameters) @codeium.parameters
+    body: (_)? @body) @definition.constructor
+  (#eq? @name "constructor")
+  (#has-type? @definition.constructor method_definition method_signature abstract_method_signature)
+  (#select-adjacent! @doc @definition.constructor)
+)
diff --git a/queries/markdown_injections.scm b/queries/markdown_injections.scm
@@ -0,0 +1,4 @@
+(
+  (inline) @injection.content
+  (#set! injection.language markdown_inline)
+)
diff --git a/queries/python_class_fields.scm b/queries/python_class_fields.scm
@@ -3,10 +3,3 @@
         (assignment) @field
     ))
 )
-(
-    (function_definition
-        name: (identifier) @name
-        parameters: (parameters) @codeium.parameters
-        body: (block . (expression_statement . (string) @doc .)?) @body) @codeium.constructor
-    (#eq? @name "__init__")
-)
diff --git a/queries/python_constructors.scm b/queries/python_constructors.scm
@@ -0,0 +1,17 @@
+(
+  (function_definition
+    name: (identifier) @name
+    parameters: (parameters) @codeium.parameters
+    body: (block . (expression_statement . (string) @doc .)?) @body) @definition.constructor
+  (#not-has-parent? @definition.constructor decorated_definition)
+  (#eq? @name "__init__")
+)
+
+(
+  (decorated_definition
+    definition: (function_definition
+      name: (identifier) @name
+      parameters: (parameters) @codeium.parameters
+      body: (block . (expression_statement . (string) @doc .)?) @body)) @definition.constructor
+  (#eq? @name "__init__")
+)
diff --git a/queries/python_tags.scm b/queries/python_tags.scm
@@ -40,4 +40,5 @@
       name: (identifier) @name
       parameters: (parameters) @codeium.parameters
       body: (block . (expression_statement . (string) @doc .)?) @body)) @definition.function
+  (#not-eq? @name "__init__")
 )
diff --git a/queries/typescript_class_fields.scm b/queries/typescript_class_fields.scm
@@ -11,25 +11,8 @@
     (object_type
         [
           (property_signature) @field
-          (construct_signature) @codeium.constructor
+          (construct_signature) @definition.constructor
           (_)
         ]
     )
 )
-
-(
-  (comment)* @doc
-  .
-  (_
-    name: (property_identifier) @name
-    parameters: (formal_parameters) @codeium.parameters
-    return_type: ([
-      (type_annotation (_) @codeium.return_type)
-      (asserts (_) @codeium.return_type)
-      (type_predicate_annotation (_) @codeium.return_type)
-    ])?
-    body: (_)? @body) @codeium.constructor
-  (#eq? @name "constructor")
-  (#has-type? @codeium.constructor method_definition method_signature abstract_method_signature)
-  (#select-adjacent! @doc @codeium.constructor)
-)
diff --git a/queries/typescript_constructors.scm b/queries/typescript_constructors.scm
@@ -0,0 +1,16 @@
+(
+  (comment)* @doc
+  .
+  (_
+    name: (property_identifier) @name
+    parameters: (formal_parameters) @codeium.parameters
+    return_type: ([
+      (type_annotation (_) @codeium.return_type)
+      (asserts (_) @codeium.return_type)
+      (type_predicate_annotation (_) @codeium.return_type)
+    ])?
+    body: (_)? @body) @definition.constructor
+  (#eq? @name "constructor")
+  (#has-type? @definition.constructor method_definition method_signature abstract_method_signature)
+  (#select-adjacent! @doc @definition.constructor)
+)
diff --git a/test_files/test.cpp b/test_files/test.cpp
@@ -14,6 +14,10 @@ struct Foo3;
 
 class Foo {
  public:
+  // Constructor comment.
+  Foo() = default;
+  // Constructor comment.
+  explicit Foo(int /*unused*/) {}
   // foo
   // foo2
   void foo() {
diff --git a/test_files/test.go b/test_files/test.go
@@ -25,7 +25,7 @@ func (p *Pattern0) Method(string) {}
 
 func (p Pattern0) Method2(a string) string {
 	Pattern2()
-	s := &Pattern0{}
+	s := &Pattern0{a: "foo"}
 	s.Method("")
 	((*Pattern0)(s)).Method("")
 	var s2 any
diff --git a/test_files/test.java b/test_files/test.java
@@ -2,6 +2,8 @@
 
 // Class Foo.
 public class Foo {
+  // Constructor comment.
+  public Foo() {}
   /** Foo1. */
   static public void foo1(int x) {}
 }
diff --git a/test_files/test.php b/test_files/test.php
@@ -14,6 +14,8 @@ public function encode(...$numbers);
 // FooClass.
 class FooClass implements FooInterface
 {
+    // Constructor comment.
+    function __construct() {}
     /**
      * @param mixed $numbers
      * @return string
diff --git a/test_files/test.py b/test_files/test.py
@@ -8,6 +8,8 @@
 
 class Pattern0:
     """Pattern 0 docstring."""
+    def __init__(self):
+        pass
 
 class Pattern0NoDoc:
     def pattern1(self):
diff --git a/test_files/test.rb b/test_files/test.rb
@@ -3,6 +3,8 @@
 # This is just your standard class
 #  nothing strange here
 class SomeClass
+  def initialize
+  end
   # In ruby, the parentheses can be omitted in many circumstances
   # This is probably a job for the AST, but we'll add a test here anyway
   def empty_parens()
diff --git a/test_files/test.tsx b/test_files/test.tsx
@@ -24,6 +24,8 @@ export declare function f4(): void;
 
 /** Foo comment. */
 class Foo {
+    // Constructor comment.
+    constructor() {}
     /** methodSignature comment. */
     methodSignature(): void;
     /** methodSignature comment. */

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ Doc:`
`9`	`9`	`// Class Foo.`
`10`	`10`	`Definition (definition.class):`
`11`	`11`	`public class Foo {`
	`12`	`+ // Constructor comment.`
	`13`	`+ public Foo() {}`
`12`	`14`	`/** Foo1. */`
`13`	`15`	`static public void foo1(int x) {}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,13 @@ class Pattern1a {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
	`47`	`+Name: constructor`
	`48`	`+Parameters: ()`
	`49`	`+Definition (definition.constructor):`
	`50`	`+constructor() {}`
	`51`	`+Lineage: [Pattern1a]`
	`52`	`+Lineage types: [class]`
	`53`	`+`
`47`	`54`	`Name: pattern0`
`48`	`55`	`Parameters: (param1)`
`49`	`56`	`Doc:`