Merge pull request #57 from Hi-Angel/cleanup-purescript-string

Get rid of purescript-string module

Author: Hi-Angel

Makefile

@@ -20,7 +20,6 @@ ELFILES = \
 	purescript-simple-indent.el \
 	purescript-sort-imports.el \
 	purescript-str.el \
-	purescript-string.el \
 	purescript-unicode-input-method.el \
 	purescript-utils.el \
 	purescript-decl-scan.el \

purescript-indent.el

@@ -89,8 +89,10 @@
 ;;; Code:
 
 (require 'purescript-vars)
-(require 'purescript-string)
 (require 'cl-lib)
+(eval-when-compile
+  (when (< emacs-major-version 28)
+    (require 'subr-x)))
 
 (defgroup purescript-indent nil
   "PureScript indentation."
@@ -655,8 +657,8 @@ symbols in the sexp."
           (string-match "where[ \t]*" purescript-indent-current-line-first-ident))
          (diff-first                 ; not a function def with the same name
           (or (null valname-string)
-              (not (string= (purescript-trim valname-string)
-                            (purescript-trim purescript-indent-current-line-first-ident)))))
+              (not (string= (string-trim valname-string)
+                            (string-trim purescript-indent-current-line-first-ident)))))
 
          ;; (is-type-def
          ;;  (and rpurs-sign (eq (char-after rpurs-sign) ?\:)))

purescript-mode.el

@@ -37,7 +37,6 @@
 (require 'purescript-vars)
 (require 'purescript-align-imports)
 (require 'purescript-sort-imports)
-(require 'purescript-string)
 (require 'purescript-font-lock)
 (require 'cl-lib)
 (cl-eval-when 'compile (require 'find-file))
@@ -419,14 +418,20 @@ Brings up the documentation for purescript-mode-hook."
     (goto-char (+ (line-beginning-position)
                   col))))
 
+(defun purescript-string-take (string n)
+  "Take n chars from string."
+  (substring string
+             0
+             (min (length string) n)))
+
 (defun purescript-mode-message-line (str)
   "Message only one line, multiple lines just disturbs the programmer."
   (let ((lines (split-string str "\n" t)))
     (when (and (car lines) (stringp (car lines)))
       (message "%s"
                (concat (car lines)
                        (if (and (cdr lines) (stringp (cadr lines)))
-                           (format " [ %s .. ]" (purescript-string-take (purescript-trim (cadr lines)) 10))
+                           (format " [ %s .. ]" (purescript-string-take (string-trim (cadr lines)) 10))
                          ""))))))
 
 (defun purescript-current-line-string ()