Merge pull request #352 from susliko/next-line-derives

Fix `derives` clause on a new line

corpus/definitions.txt

@@ -502,7 +502,9 @@ class A
 ================================================================================
 Class definitions (Scala 3)
 ================================================================================
-final case class C() extends A derives B, C.D
+final case class C() 
+  extends A 
+  derives B, C.D
 --------------------------------------------------------------------------------
 
 (compilation_unit

grammar.js

@@ -42,6 +42,7 @@ module.exports = grammar({
     "catch",
     "finally",
     "extends",
+    "derives",
     "with",
   ],
 

script/smoke_test.sh

@@ -5,7 +5,7 @@
 SCALA_SCALA_LIBRARY_EXPECTED=100
 SCALA_SCALA_COMPILER_EXPECTED=96
 DOTTY_COMPILER_EXPECTED=84
-SYNTAX_COMPLEXITY_CEILING=1300
+SYNTAX_COMPLEXITY_CEILING=1400
 
 if [ ! -d "$SCALA_SCALA_DIR" ]; then
   echo "\$SCALA_SCALA_DIR must be set"

src/scanner.c

@@ -18,6 +18,7 @@ enum TokenType {
   CATCH,
   FINALLY,
   EXTENDS,
+  DERIVES,
   WITH,
 };
 
@@ -255,25 +256,33 @@ bool tree_sitter_scala_external_scanner_scan(void *payload, TSLexer *lexer,
     }
 
     if (valid_symbols[CATCH]) {
-      if (lexer->lookahead == 'c') {
-        return !scan_word(lexer, "catch");
-      }
-      if (lexer->lookahead == 'f') {
-        return !scan_word(lexer, "finally");
+      if (scan_word(lexer, "catch")) {
+        return false;
       }
-      return true;
     }
 
     if (valid_symbols[FINALLY]) {
-      return !scan_word(lexer, "finally");
+      if  (scan_word(lexer, "finally")) {
+        return false;
+      }
     }
 
     if (valid_symbols[EXTENDS]) {
-      return !scan_word(lexer, "extends");
+      if (scan_word(lexer, "extends")) {
+        return false;
+      }
     }
 
     if (valid_symbols[WITH]) {
-      return !scan_word(lexer, "with");
+      if (scan_word(lexer, "with")) {
+        return false;
+      }
+    }
+
+    if (valid_symbols[DERIVES]) {
+      if (scan_word(lexer, "derives")) {
+        return false;
+      }
     }
 
     if (newline_count > 1) {