Merge branch 'master' into wip/repeat_pattern

Author: eed3si9n

Cargo.toml

@@ -4,7 +4,7 @@ description = "scala grammar for the tree-sitter parsing library"
 version = "0.20.0"
 keywords = ["incremental", "parsing", "scala"]
 categories = ["parsing", "text-editors"]
-repository = "https://github.com/tree-sitter/tree-sitter-javascript"
+repository = "https://github.com/tree-sitter/tree-sitter-scala"
 edition = "2018"
 license = "MIT"
 

corpus/expressions.txt

@@ -95,6 +95,10 @@ Call expressions (Scala 3 syntax)
 
 class C {
   a(b, c)(using A.B)
+
+  foo(new A:
+    def a = new B:
+      def b = 1)
 }
 
 --------------------------------------------------------------------------------
@@ -112,7 +116,21 @@ class C {
         (arguments
           (field_expression
             (identifier)
-            (identifier)))))))
+            (identifier))))
+      (call_expression
+        (identifier)
+        (arguments
+          (instance_expression
+            (type_identifier)
+            (template_body
+              (function_definition
+                (identifier)
+                (instance_expression
+                  (type_identifier)
+                  (template_body
+                    (function_definition
+                      (identifier)
+                      (integer_literal))))))))))))
 
 ================================================================================
 SIP-44 Fewer braces (Scala 3 syntax)

corpus/types.txt

@@ -198,6 +198,9 @@ type G = H[A1] {
   def foo[A2 <: Stepper[_]]: A2
 }
 
+type I = F1[A1:
+  def foo: A2]
+
 --------------------------------------------------------------------------------
 
 (compilation_unit
@@ -235,7 +238,18 @@ type G = H[A1] {
                 (type_identifier)
                 (type_arguments
                   (wildcard)))))
-          (type_identifier))))))
+          (type_identifier)))))
+  (type_definition
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (compound_type
+          (type_identifier)
+          (refinement
+            (function_declaration
+              (identifier)
+              (type_identifier))))))))
 
 ================================================================================
 Infix types

script/smoke_test.sh

@@ -4,7 +4,7 @@
 
 SCALA_SCALA_LIBRARY_EXPECTED=95
 SCALA_SCALA_COMPILER_EXPECTED=87
-DOTTY_COMPILER_EXPECTED=81
+DOTTY_COMPILER_EXPECTED=82
 SYNTAX_COMPLEXITY_CEILING=2500
 
 if [ ! -d "$SCALA_SCALA_DIR" ]; then

src/scanner.c

@@ -99,7 +99,12 @@ bool tree_sitter_scala_external_scanner_scan(void *payload, TSLexer *lexer,
 
   // Before advancing the lexer, check if we can double outdent
   if (valid_symbols[OUTDENT] &&
-      (lexer->lookahead == 0 || (
+      (lexer->lookahead == 0 ||
+      (
+        (prev != -1) &&
+        lexer->lookahead == ')' ||
+        lexer->lookahead == ']'
+      ) || (
         stack->last_indentation_size != -1 &&
         prev != -1 &&
         stack->last_indentation_size < prev))) {