branch: elpa/haskell-tng-mode commit e84970b9f330309119237c1db99bda5d8e902f0d Author: Tseen She <ts33n....@gmail.com> Commit: Tseen She <ts33n....@gmail.com>
rename -contrib to -extra --- README.md | 14 +++++++------- haskell-tng-compile.el | 2 +- ...ll-tng-contrib-abbrev.el => haskell-tng-extra-abbrev.el | 6 +++--- ...-tng-contrib-company.el => haskell-tng-extra-company.el | 6 +++--- ...ontrib-projectile.el => haskell-tng-extra-projectile.el | 6 +++--- ...trib-smartparens.el => haskell-tng-extra-smartparens.el | 10 +++++----- haskell-tng-contrib-stack.el => haskell-tng-extra-stack.el | 6 +++--- ...-contrib-yasnippet.el => haskell-tng-extra-yasnippet.el | 6 +++--- haskell-tng-contrib.el => haskell-tng-extra.el | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 474bb95..77ba24f 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ A full installation may look like the following :config (require 'haskell-tng-hsinspect) - (require 'haskell-tng-contrib) - (require 'haskell-tng-contrib-abbrev) - (require 'haskell-tng-contrib-company) - (require 'haskell-tng-contrib-projectile) - (require 'haskell-tng-contrib-smartparens) - (require 'haskell-tng-contrib-yasnippet) + (require 'haskell-tng-extra) + (require 'haskell-tng-extra-abbrev) + (require 'haskell-tng-extra-company) + (require 'haskell-tng-extra-projectile) + (require 'haskell-tng-extra-smartparens) + (require 'haskell-tng-extra-yasnippet) :bind (:map @@ -84,7 +84,7 @@ To use `hsinspect` commands, generate `.ghc.flags` / `.ghc.version` files by run `hsinspect` only works when the dependencies of the current file have been compiled (the current file doesn't need to be compilable). -The `haskell-tng-contrib-company` package will automatically complete symbols that are in scope. +The `haskell-tng-extra-company` package will automatically complete symbols that are in scope. To find out which module a symbol belongs to, use `M-x haskell-tng-fqn-at-point`. diff --git a/haskell-tng-compile.el b/haskell-tng-compile.el index 062ffec..322ff84 100644 --- a/haskell-tng-compile.el +++ b/haskell-tng-compile.el @@ -68,7 +68,7 @@ (defvar-local haskell-tng--compile-alt "cabal v2-clean") (defvar haskell-tng--compile-dominating-project - ;; TODO move stack.yaml to contrib-stack + ;; TODO move stack.yaml to extra-stack (rx (| "cabal.project" "cabal.project.local" "cabal.project.freeze" "stack.yaml"))) (defvar haskell-tng--compile-dominating-package (rx (| (: (+ any) ".cabal") "package.yaml"))) diff --git a/haskell-tng-contrib-abbrev.el b/haskell-tng-extra-abbrev.el similarity index 81% rename from haskell-tng-contrib-abbrev.el rename to haskell-tng-extra-abbrev.el index 48cdb48..285cd5e 100644 --- a/haskell-tng-contrib-abbrev.el +++ b/haskell-tng-extra-abbrev.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-abbrev.el --- abbrev-mode integration -*- lexical-binding: t -*- +;;; haskell-tng-extra-abbrev.el --- abbrev-mode integration -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -36,5 +36,5 @@ (lambda () (abbrev-mode 1))) -(provide 'haskell-tng-contrib-abbrev) -;;; haskell-tng-contrib-abbrev.el ends here +(provide 'haskell-tng-extra-abbrev) +;;; haskell-tng-extra-abbrev.el ends here diff --git a/haskell-tng-contrib-company.el b/haskell-tng-extra-company.el similarity index 93% rename from haskell-tng-contrib-company.el rename to haskell-tng-extra-company.el index e436220..f5ad1c1 100644 --- a/haskell-tng-contrib-company.el +++ b/haskell-tng-extra-company.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-company.el --- company mode integration -*- lexical-binding: t -*- +;;; haskell-tng-extra-company.el --- company mode integration -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -75,5 +75,5 @@ (setq-local company-backends haskell-tng-company-backends) (company-mode 1))) -(provide 'haskell-tng-contrib-company) -;;; haskell-tng-contrib-company.el ends here +(provide 'haskell-tng-extra-company) +;;; haskell-tng-extra-company.el ends here diff --git a/haskell-tng-contrib-projectile.el b/haskell-tng-extra-projectile.el similarity index 68% rename from haskell-tng-contrib-projectile.el rename to haskell-tng-extra-projectile.el index 46a70f3..8b2f917 100644 --- a/haskell-tng-contrib-projectile.el +++ b/haskell-tng-extra-projectile.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-projectile.el --- Projectile integration -*- lexical-binding: t -*- +;;; haskell-tng-extra-projectile.el --- Projectile integration -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -18,5 +18,5 @@ (setq-local projectile-tags-command "fast-tags -Re --exclude=dist-newstyle --exclude=.stack-work .") )) -(provide 'haskell-tng-contrib-projectile) -;;; haskell-tng-contrib-projectile.el ends here +(provide 'haskell-tng-extra-projectile) +;;; haskell-tng-extra-projectile.el ends here diff --git a/haskell-tng-contrib-smartparens.el b/haskell-tng-extra-smartparens.el similarity index 64% rename from haskell-tng-contrib-smartparens.el rename to haskell-tng-extra-smartparens.el index 7945f5d..9b7e96d 100644 --- a/haskell-tng-contrib-smartparens.el +++ b/haskell-tng-extra-smartparens.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-smartparens.el --- smartparens integration -*- lexical-binding: t -*- +;;; haskell-tng-extra-smartparens.el --- smartparens integration -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -17,8 +17,8 @@ (sp-local-pair 'haskell-tng-mode (car pair) (cdr pair) :post-handlers '(("| " "SPC")))) -(advice-add #'sp--indent-region :around #'haskell-tng--contrib-sp-indent) -(defun haskell-tng--contrib-sp-indent (f &rest args) +(advice-add #'sp--indent-region :around #'haskell-tng--extra-sp-indent) +(defun haskell-tng--extra-sp-indent (f &rest args) "Disables `sp--indent-region' locally." (unless (eq major-mode 'haskell-tng-mode) (apply f args))) @@ -28,5 +28,5 @@ (lambda () (smartparens-mode 1))) -(provide 'haskell-tng-contrib-smartparens) -;;; haskell-tng-contrib-smartparens.el ends here +(provide 'haskell-tng-extra-smartparens) +;;; haskell-tng-extra-smartparens.el ends here diff --git a/haskell-tng-contrib-stack.el b/haskell-tng-extra-stack.el similarity index 52% rename from haskell-tng-contrib-stack.el rename to haskell-tng-extra-stack.el index 94204d1..40562fa 100644 --- a/haskell-tng-contrib-stack.el +++ b/haskell-tng-extra-stack.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-stack.el --- sets stack as the default -*- lexical-binding: t -*- +;;; haskell-tng-extra-stack.el --- sets stack as the default -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -12,5 +12,5 @@ ;; TODO document ;; FIXME implement -(provide 'haskell-tng-contrib-stack) -;;; haskell-tng-contrib-stack.el ends here +(provide 'haskell-tng-extra-stack) +;;; haskell-tng-extra-stack.el ends here diff --git a/haskell-tng-contrib-yasnippet.el b/haskell-tng-extra-yasnippet.el similarity index 66% rename from haskell-tng-contrib-yasnippet.el rename to haskell-tng-extra-yasnippet.el index 6fb2e40..72f13fb 100644 --- a/haskell-tng-contrib-yasnippet.el +++ b/haskell-tng-extra-yasnippet.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib-yasnippet.el --- yasnippet integration -*- lexical-binding: t -*- +;;; haskell-tng-extra-yasnippet.el --- yasnippet integration -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -22,5 +22,5 @@ (lambda () (yas-minor-mode 1))) -(provide 'haskell-tng-contrib-yasnippet) -;;; haskell-tng-contrib-yasnippet.el ends here +(provide 'haskell-tng-extra-yasnippet) +;;; haskell-tng-extra-yasnippet.el ends here diff --git a/haskell-tng-contrib.el b/haskell-tng-extra.el similarity index 95% rename from haskell-tng-contrib.el rename to haskell-tng-extra.el index c4123c6..7834dff 100644 --- a/haskell-tng-contrib.el +++ b/haskell-tng-extra.el @@ -1,4 +1,4 @@ -;;; haskell-tng-contrib.el --- Untested features -*- lexical-binding: t -*- +;;; haskell-tng-extra.el --- Untested features -*- lexical-binding: t -*- ;; Copyright (C) 2019 Tseen She ;; License: GPL 3 or any later version @@ -88,5 +88,5 @@ "\\/")))) ".")) -(provide 'haskell-tng-contrib) -;;; haskell-tng-contrib.el ends here +(provide 'haskell-tng-extra) +;;; haskell-tng-extra.el ends here