Handle excess whitespace more robustly

Wilfred · Wilfred · commit 38e93aad4d51 · 2017-03-03T15:28:10.000Z
diff --git a/pyimport.el b/pyimport.el
@@ -261,7 +261,10 @@ on line number LINE, remove VAR (e.g. 'baz')."
             (pyimport--remove-on-line (format "%s, " var))
             (pyimport--remove-on-line var))
         ;; If we only have "from foo import " left, remove the rest of the line.
-        (when (or (looking-at (rx "from " (1+ (not (any space))) " import" (1+ space) line-end))
+        (when (or (looking-at (rx "from" (+ space)
+                                  (+ (or (syntax word) (syntax symbol) (syntax punctuation))) (+ space)
+                                  "import" (1+ space)
+                                  line-end))
                   (looking-at (rx "from " (1+ (not (any space))) " import " (1+ (not (any space))) " as" (1+ space) line-end))
                   (looking-at (rx "import " (1+ (not (any space))) " as" (1+ space) line-end)))
           (pyimport--delete-current-line)))))))
diff --git a/test/pyimport-test.el b/test/pyimport-test.el
@@ -27,7 +27,7 @@
 (ert-deftest remove-import-extra-whitespace ()
   "Ensure we remove imports correctly even when there's extra whitespace."
   (with-temp-buffer
-    (insert "from foo import   bar")
+    (insert "from   foo  import   bar")
     (pyimport--remove-import 1 "bar")
     (should
      (equal (buffer-string) ""))))
