diff options
| -rw-r--r-- | oni-js.el (renamed from oni-js2-mode.el) | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/oni-js2-mode.el b/oni-js.el index 7932943..f6e6ff6 100644 --- a/oni-js2-mode.el +++ b/oni-js.el @@ -1,10 +1,10 @@ -;;; oni-js2-mode.el --- js2-mode configuration -*- lexical-binding: t; -*- +;;; oni-js.el --- JavaScript configuration -*- lexical-binding: t; -*- ;; Copyright (C) 2019 Tom Willemse ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 20190219001218 +;; Version: 20190224201011 ;; Package-Requires: (oni-company js2-mode js2-refactor flycheck fill-column-indicator tern company-tern fic-mode) ;; This program is free software; you can redistribute it and/or modify @@ -22,11 +22,12 @@ ;;; Commentary: -;; My `js2-mode' configuration. +;; JavaScript configuration. ;;; Code: (require 'company) +(require 'js) (require 'js2-mode) (require 'js2-refactor) (require 'whitespace) @@ -34,23 +35,28 @@ (eval-when-compile (require 'grep)) -(defun oni-js2-mode-whitespace-mode () +(defun oni-js-whitespace-mode () "Enable whitespace mode with only tabs showing." (setq-local whitespace-style '(face tabs)) (whitespace-mode)) +(setq js-enabled-frameworks '(javascript)) + (setq js2-include-node-externs t) (setq js2-strict-trailing-comma-warning nil) (setq js2-strict-missing-semi-warning nil) (setq js2-basic-offset 2) +(add-hook 'js-mode-hook 'electric-pair-local-mode) +(add-hook 'js-mode-hook 'electric-indent-local-mode) + (add-hook 'js2-mode-hook 'company-mode) (add-hook 'js2-mode-hook 'electric-pair-local-mode) (add-hook 'js2-mode-hook 'fci-mode) (add-hook 'js2-mode-hook 'fic-mode) (add-hook 'js2-mode-hook 'flycheck-mode) (add-hook 'js2-mode-hook 'js2-refactor-mode) -(add-hook 'js2-mode-hook 'oni-js2-mode-whitespace-mode) +(add-hook 'js2-mode-hook 'oni-js-whitespace-mode) (add-hook 'js2-mode-hook 'subword-mode) (add-hook 'js2-mode-hook 'tern-mode) @@ -58,7 +64,7 @@ (add-to-list 'company-backends 'company-tern) -;;;###autoload(with-eval-after-load 'js2-mode (require 'oni-js2-mode)) +;;;###autoload(with-eval-after-load 'js2-mode (require 'oni-js)) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) @@ -67,5 +73,5 @@ (with-eval-after-load 'grep (add-to-list 'grep-files-aliases '("js" . "*.js *.jsx *.json"))) -(provide 'oni-js2-mode) -;;; oni-js2-mode.el ends here +(provide 'oni-js) +;;; oni-js.el ends here |