Skip to content

Commit fa7ca1f

Browse files
authored
Replace .editorconfig with .dir-locals and .gitattributes (#1928)
* Replace .editorconfig with .dir-locals and .gitattributes Everybody working on this project is using Emacs. Committing .dir-locals permits more direct control of Emacs-specific settings. * Normalize files * Move flycheck-disabled-checkers to .dir-locals.el * Add lsp-defun to imenu-generic-expression for emacs-lisp-mode
1 parent 305794f commit fa7ca1f

19 files changed

+23
-68
lines changed

.dir-locals.el

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
((nil
2+
(require-final-newline . t))
3+
(emacs-lisp-mode
4+
(eval . (let ((dirloc-lsp-defun-regexp
5+
(concat
6+
(concat "^\\s-*("
7+
"lsp-defun"
8+
"\\s-+\\(")
9+
(or (bound-and-true-p lisp-mode-symbol-regexp)
10+
"\\(?:\\sw\\|\\s_\\|\\\\.\\)+")
11+
"\\)")))
12+
(add-to-list 'imenu-generic-expression
13+
(list "Functions" dirloc-lsp-defun-regexp 1))))
14+
(flycheck-disabled-checkers . '(emacs-lisp-checkdoc))
15+
(indent-tabs-mode . nil)))

.editorconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ flycheck_*.el
4141
# projectiles files
4242
.projectile
4343

44-
# directory configuration
45-
.dir-locals.el
46-
4744
/*-autoloads.el
4845
/*-pkg.el
4946
/.ecukes-failing-scenarios

lsp-css.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,3 @@ server."
250250

251251
(provide 'lsp-css)
252252
;;; lsp-css.el ends here
253-
254-
;; Local Variables:
255-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
256-
;; End:

lsp-gdscript.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,3 @@
5757
(provide 'lsp-gdscript)
5858

5959
;;; lsp-gdscript.el ends here
60-
61-
;; Local Variables:
62-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
63-
;; End:

lsp-go.el

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,3 @@ $GOPATH/pkg/mod along with the value of
257257
(provide 'lsp-go)
258258
;;; lsp-go.el ends here
259259

260-
;; Local Variables:
261-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
262-
;; End:

lsp-html.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,3 @@ styles."
192192

193193
(provide 'lsp-html)
194194
;;; lsp-html.el ends here
195-
196-
;; Local Variables:
197-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
198-
;; End:

lsp-intelephense.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,3 @@ language server."
199199
(provide 'lsp-intelephense)
200200

201201
;;; lsp-intelephense.el ends here
202-
203-
;; Local Variables:
204-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
205-
;; End:

lsp-mode.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8758,7 +8758,3 @@ See https://github.com/emacs-lsp/lsp-mode."
87588758

87598759
(provide 'lsp-mode)
87608760
;;; lsp-mode.el ends here
8761-
8762-
;; Local Variables:
8763-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
8764-
;; End:

lsp-perl.el

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,3 @@
6464
(provide 'lsp-perl)
6565
;;; lsp-perl.el ends here
6666

67-
;; Local Variables:
68-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
69-
;; End:

lsp-pyls.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,3 @@ So it will rename only references it can find."
482482

483483
(provide 'lsp-pyls)
484484
;;; lsp-pyls.el ends here
485-
486-
;; Local Variables:
487-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
488-
;; End:

lsp-rust.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,3 @@ The command should include `--message=format=json` or similar option."
711711

712712
(provide 'lsp-rust)
713713
;;; lsp-rust.el ends here
714-
715-
;; Local Variables:
716-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
717-
;; End:

lsp-solargraph.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,3 @@
153153

154154
(provide 'lsp-solargraph)
155155
;;; lsp-solargraph.el ends here
156-
157-
;; Local Variables:
158-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
159-
;; End:

lsp-vetur.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,3 @@ Code's JavaScript and TypeScript support."
848848

849849
(provide 'lsp-vetur)
850850
;;; lsp-vetur.el ends here
851-
852-
;; Local Variables:
853-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
854-
;; End:

lsp-xml.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,3 @@ Newlines and excess whitespace are removed."
213213

214214
(provide 'lsp-xml)
215215
;;; lsp-xml.el ends here
216-
217-
;; Local Variables:
218-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
219-
;; End:

lsp-yaml.el

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,3 @@
137137

138138
(provide 'lsp-yaml)
139139
;;; lsp-yaml.el ends here
140-
141-
;; Local Variables:
142-
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
143-
;; End:

test/fixtures/requests

Lines changed: 6 additions & 5 deletions
Large diffs are not rendered by default.

test/lsp-common-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
(seq-doseq (library (-filter
5858
(lambda (file)
5959
(and (f-ext? file "el")
60+
(not (s-contains? ".dir-locals" file))
6061
(not (s-contains? "test" file))))
6162
(append (when (or load-file-name buffer-file-name)
6263
(f-files (f-parent (f-dirname (or load-file-name buffer-file-name)))))

0 commit comments

Comments
 (0)