Merge pull request #305 from juergenhoetzel/dir-locals

Enforce code style via .dir-locals.el

Author: juergenhoetzel

.dir-locals.el

@@ -0,0 +1,5 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((emacs-lisp-mode . ((indent-tabs-mode . nil)
+		     (fill-column . 120))))

.gitignore

@@ -1,6 +1,7 @@
 *.elc
 bin
 tmp
+*~
 
 # Useful for doing releases
 emacs-fsharp-mode-bin/

eglot-fsharp.el

@@ -1,8 +1,8 @@
 ;;; eglot-fsharp.el --- fsharp-mode eglot integration                     -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019-2021  Jürgen Hötzel
+;; Copyright (C) 2019-2022  Jürgen Hötzel
 
-;; Author: Jürgen Hötzel <juergen@archlinux.org>
+;; Author: Jürgen Hötzel <juergen@hoetzel.info>
 ;; Package-Requires: ((emacs "27.1") (eglot "1.4") (fsharp-mode "1.10") (jsonrpc "1.0.14"))
 ;; Version: 1.10
 ;; Keywords: languages
@@ -108,18 +108,18 @@
                    (version<= emacs-version "26.2"))
               "NORMAL:-VERS-TLS1.3"
             gnutls-algorithm-priority))))
-      (unless (eglot-fsharp-current-version-p version)
-      (url-copy-file url zip t)
-      ;; FIXME: Windows (unzip preinstalled?)
-      (let ((default-directory (file-name-directory (eglot-fsharp--path-to-server))))
-        (unless (zerop (call-process "unzip" nil nil nil "-o" zip))
-          (error "Failed to unzip %s" zip))
-	(unless (eq system-type 'windows-nt)
-	  (dolist  (file (directory-files-recursively (file-name-directory (eglot-fsharp--path-to-server)) "." t))
-	    (if (file-directory-p file)
-		(chmod file #o755)
-	      (chmod file #o644)))))
-      (delete-file zip)))
+  (unless (eglot-fsharp-current-version-p version)
+    (url-copy-file url zip t)
+    ;; FIXME: Windows (unzip preinstalled?)
+    (let ((default-directory (file-name-directory (eglot-fsharp--path-to-server))))
+      (unless (zerop (call-process "unzip" nil nil nil "-o" zip))
+        (error "Failed to unzip %s" zip))
+      (unless (eq system-type 'windows-nt)
+	(dolist  (file (directory-files-recursively (file-name-directory (eglot-fsharp--path-to-server)) "." t))
+	  (if (file-directory-p file)
+	      (chmod file #o755)
+	    (chmod file #o644)))))
+    (delete-file zip)))
 
 
 (defun eglot-fsharp--process-tool-action (response)
@@ -169,7 +169,7 @@ Ensure FsAutoComplete is installed (when called INTERACTIVE)."
 			  (t `("mono" ,(eglot-fsharp--path-to-server)))))
 	  (arg-list (if eglot-fsharp-server-verbose
 			`("--background-service-enabled" "-v")
-            	        `("--background-service-enabled")
+            	      `("--background-service-enabled")
 		      )))
       (cons 'eglot-fsautocomplete (append cmd-list arg-list)))))
 

fsharp-mode-font.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010 Laurent Le Brun
 
 ;; Author: 2010-2011 Laurent Le Brun <[email protected]>
-;; Maintainer: Robin Neatherway <[email protected]>
+;; Maintainer: Jürgen Hötzel <[email protected]>
 ;; Keywords: languages
 
 ;; This file is not part of GNU Emacs.

fsharp-mode-structure.el

@@ -24,19 +24,19 @@ then run BODY."
   (face-at-point))
 
 (describe "When locking operators"
-  (it "uses ui operator face for pipes"
-    (with-highlighted "<<| |>> |> ||> |||> <| <|| <||| <|> <<|!"
-      (should (equal (str-face " |> ") 'fsharp-ui-operator-face))
-      (should (equal (str-face " ||> ") 'fsharp-ui-operator-face))
-      (should (equal (str-face " |||> ") 'fsharp-ui-operator-face))
-      (should (equal (str-face " <| ") 'fsharp-ui-operator-face))
-      (should (equal (str-face " <|| ") 'fsharp-ui-operator-face))
-      (should (equal (str-face " <||| ") 'fsharp-ui-operator-face)))))
+          (it "uses ui operator face for pipes"
+              (with-highlighted "<<| |>> |> ||> |||> <| <|| <||| <|> <<|!"
+                                (should (equal (str-face " |> ") 'fsharp-ui-operator-face))
+                                (should (equal (str-face " ||> ") 'fsharp-ui-operator-face))
+                                (should (equal (str-face " |||> ") 'fsharp-ui-operator-face))
+                                (should (equal (str-face " <| ") 'fsharp-ui-operator-face))
+                                (should (equal (str-face " <|| ") 'fsharp-ui-operator-face))
+                                (should (equal (str-face " <||| ") 'fsharp-ui-operator-face)))))
 
 (describe "When locking operators"
-  (it "uses ui generic face for custom operators containing pipes"
-    (with-highlighted "<<| |>> |> ||> |||> <| <|| <||| <|> <<|!"
-      (should (equal (str-face "<<| ") 'fsharp-ui-generic-face))
-      (should (equal (str-face " |>> ") 'fsharp-ui-generic-face))
-      (should (equal (str-face " <|> ") 'fsharp-ui-generic-face))
-      (should (equal (str-face " <<|!") 'fsharp-ui-generic-face)))))
+          (it "uses ui generic face for custom operators containing pipes"
+              (with-highlighted "<<| |>> |> ||> |||> <| <|| <||| <|> <<|!"
+                                (should (equal (str-face "<<| ") 'fsharp-ui-generic-face))
+                                (should (equal (str-face " |>> ") 'fsharp-ui-generic-face))
+                                (should (equal (str-face " <|> ") 'fsharp-ui-generic-face))
+                                (should (equal (str-face " <<|!") 'fsharp-ui-generic-face)))))