Support definitely non-nullable type

Emacs-Kotlin-Mode-Maintainers · Jan 15, 2023 · 3e548c2 · 3e548c2
1 parent 658af11
commit 3e548c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/kotlin-mode-lexer.el b/kotlin-mode-lexer.el
@@ -683,7 +683,7 @@ expression as a token with one of the following types:
         '(implicit-\; string-chunk-before-template-expression))
        (member
         (kotlin-mode--token-text previous-token)
-        '("(" "{" "[" "*" "%" "/" "+" "-" "&&" "||" ":"
+        '("(" "{" "[" "*" "%" "/" "+" "-" "&&" "||" ":" "&"
           "=" "+=" "-=" "*=" "/=" "%="
           "->" "." ".." "::" "?:" "?." "<=" ">=" "!=" "!==" "==" "==="
           "as" "as?" "is" "!is" "in" "!in" "," ";" "{" "[" "("
@@ -790,7 +790,7 @@ expression as a token with one of the following types:
            '(implicit-\; string-chunk-after-template-expression))
           (member
            (kotlin-mode--token-text next-token)
-           '("*" "%" "/" "&&" "||" ":" "=" "+=" "-=" "*=" "/=" "%="
+           '("*" "%" "/" "&" "&&" "||" ":" "=" "+=" "-=" "*=" "/=" "%="
              "->" "." ".." "::" "?:" "?." "?" "<" ">" "<=" ">="
              "!=" "!==" "==" "==="
              "," ";" ")" "]" "}"
@@ -1828,7 +1828,7 @@ This function does not return `implicit-;'."
        "=" "+=" "-=" "*=" "/=" "%="
        "->"
        ".." "." "?:" "?." "?" "<" ">" "<=" ">=" "==" "==="
-       "*" "%" "/" "+" "-")))
+       "*" "%" "/" "+" "-" "&")))
     (let ((text (match-string-no-properties 0))
           (start (match-beginning 0))
           (end (match-end 0)))
@@ -2233,7 +2233,7 @@ This function does not return `implicit-;'"
    ((member (buffer-substring-no-properties
              (max (point-min) (- (point) 1))
              (point))
-            '("*" "%" "/" "+" "-" "!" "=" "." "?" "<" ">"))
+            '("*" "%" "/" "+" "-" "!" "=" "." "?" "<" ">" "&"))
     (backward-char)
     (make-instance 'kotlin-mode--token
                    :type 'operator

diff --git a/test/pathological.kt b/test/pathological.kt
@@ -426,6 +426,15 @@ public
         ->
         C
 
+    // definitelyNonNullableType
+    fun foo(
+        x:
+            A
+            &
+            Any
+    ) {
+    }
+
     // value class
 
     value
-Original file line number
+Diff line change
@@ Expand Up / @@ -426,6 +426,15 @@ public @@
             ->
             C
+        // definitelyNonNullableType
+        fun foo(
+            x:
+                A
+                &
+                Any
+        ) {
+        }
         // value class
         value
@@ Expand Down @@