Make TYPE_CHECKING less fragile with whitespace (#215)

Closes #214

Author: sigmavirus24

flake8_import_order/__init__.py

@@ -38,6 +38,7 @@
         "modules",
         "names",
         "lineno",
+        "end_lineno",
         "level",
         "package",
         "type_checking",
@@ -113,6 +114,7 @@ def visit_Import(self, node):  # noqa: N802
                 modules,
                 [],
                 node.lineno,
+                node.end_lineno,
                 0,
                 root_package_name(modules[0]),
                 self._type_checking_import(node),
@@ -133,6 +135,7 @@ def visit_ImportFrom(self, node):  # noqa: N802
                 [module],
                 names,
                 node.lineno,
+                node.end_lineno,
                 node.level,
                 root_package_name(module),
                 self._type_checking_import(node),

flake8_import_order/styles.py

@@ -78,7 +78,7 @@ def _check_I101(self, current_import):  # noqa: N802
             )
 
     def _check_I300(self, previous_import, current_import):  # noqa: N802
-        if current_import.lineno - previous_import.lineno != 3:
+        if current_import.lineno - previous_import.end_lineno != 3:
             yield Error(
                 current_import.lineno,
                 "I300",

tests/test_cases/additional_newline.py

@@ -22,6 +22,15 @@
 from . import A
 
 from . import B  # I202
+from .Z import (
+    A,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+)
 
 if TYPE_CHECKING:
     import ast

tests/test_cases/complete_google.py

@@ -31,6 +31,16 @@
 from .. import B
 from ..A import A
 from ..B import B
+from ..Z import (
+    A,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+    H,
+)
 
 if TYPE_CHECKING:
     import ast

tests/test_style_cases.py

@@ -67,8 +67,11 @@ def _checker(filename, tree, style_entry_point):
 )
 def test_styles(filename, tree, style, expected_codes):
     checker = _checker(filename, tree, style)
-    codes = [error.code for error in checker.check_order()]
-    assert codes == expected_codes
+    codes = [
+        (filename, error.lineno, error.code)
+        for error in checker.check_order()
+    ]
+    assert [i[2] for i in codes] == expected_codes, codes
 
 
 def test_unknown_style():