Address regressions on 'not in' operator

Closes #14783.

Author: josevalim

lib/elixir/src/elixir_parser.yrl

@@ -751,9 +751,9 @@ build_op({UOp, _, [Left]}, {_Kind, {Line, Column, _} = Location, 'in'}, Right) w
   Meta = meta_from_location(Location),
   {UOp, Meta, [{'in', Meta, [Left, Right]}]};
 
-build_op(Left, {_Kind, Location, 'not in'}, Right) ->
-  NotMeta = meta_from_location(Location),
-  InMeta = meta_from_location(element(3, Location)),
+build_op(Left, {in_op, NotLocation, 'not in', InLocation}, Right) ->
+  NotMeta = newlines_op(NotLocation) ++ meta_from_location(NotLocation),
+  InMeta = meta_from_location(InLocation),
   {'not', NotMeta, [{'in', InMeta, [Left, Right]}]};
 
 build_op(Left, {_Kind, Location, Op}, Right) ->

lib/elixir/src/elixir_tokenizer.erl

@@ -1685,12 +1685,14 @@ tokenize_keyword(Kind, Rest, Line, Column, Atom, Length, Scope, Tokens) ->
         [{identifier, {Line, Column, nil}, Atom} | Tokens];
 
       _ ->
+        Info = {Line, Column, previous_was_eol(Tokens)},
+
         case {Kind, Tokens} of
-          {in_op, [{unary_op, {NotLine, NotColumn, _}, 'not'} | T]} ->
-            add_token_with_eol({in_op, {NotLine, NotColumn, {Line, Column, nil}}, 'not in'}, T);
+          {in_op, [{unary_op, NotInfo, 'not'} | T]} ->
+            add_token_with_eol({in_op, NotInfo, 'not in', Info}, T);
 
           {_, _} ->
-            add_token_with_eol({Kind, {Line, Column, previous_was_eol(Tokens)}, Atom}, Tokens)
+            add_token_with_eol({Kind, Info, Atom}, Tokens)
         end
     end,
 

lib/elixir/test/elixir/kernel/parser_test.exs

@@ -489,12 +489,33 @@ defmodule Kernel.ParserTest do
                    [{:a, [line: 1, column: 1], nil}, {:b, [line: 1, column: 10], nil}]}
                 ]}
 
-      assert Code.string_to_quoted!("a not  in b", columns: true) ==
+      assert Code.string_to_quoted!("a not  in b", columns: true, token_metadata: true) ==
                {:not, [line: 1, column: 3],
                 [
                   {:in, [line: 1, column: 8],
                    [{:a, [line: 1, column: 1], nil}, {:b, [line: 1, column: 11], nil}]}
                 ]}
+
+      assert Code.string_to_quoted!("a\nnot in b", columns: true, token_metadata: true) ==
+               {:not, [newlines: 1, line: 2, column: 1],
+                [
+                  {:in, [line: 2, column: 5],
+                   [{:a, [line: 1, column: 1], nil}, {:b, [line: 2, column: 8], nil}]}
+                ]}
+
+      assert Code.string_to_quoted!("a not in\nb", columns: true, token_metadata: true) ==
+               {:not, [newlines: 1, line: 1, column: 3],
+                [
+                  {:in, [line: 1, column: 7],
+                   [{:a, [line: 1, column: 1], nil}, {:b, [line: 2, column: 1], nil}]}
+                ]}
+
+      assert Code.string_to_quoted!("a\nnot in\nb", columns: true, token_metadata: true) ==
+               {:not, [newlines: 1, line: 2, column: 1],
+                [
+                  {:in, [line: 2, column: 5],
+                   [{:a, [line: 1, column: 1], nil}, {:b, [line: 3, column: 1], nil}]}
+                ]}
     end
 
     test "handles maps and structs" do