From ff716616b6df3b4d7c66b8efde50197ae6bf0b3f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 6 Nov 2015 02:21:45 -0500 Subject: [PATCH] Change template file prefix from @@ to __ --- core/core-auto-insert.el | 88 +++++++++---------- .../{@@build.gradle => __build.gradle} | 0 private/templates/c++-mode/{@@.cpp => __.cpp} | 0 .../c++-mode/{@@main.cpp => __main.cpp} | 0 .../c++-mode/{@@winmain.cpp => __winmain.cpp} | 0 private/templates/c-mode/{@@.c => __.c} | 0 private/templates/c-mode/{@@.h => __.h} | 0 .../{@@initfile => __initfile} | 0 private/templates/gitignore-mode/{@@ => __} | 0 private/templates/go-mode/{@@.go => __.go} | 0 .../go-mode/{@@main.go => __main.go} | 0 private/templates/java-mode/{@@ => __} | 0 .../templates/java-mode/{@@main => __main} | 0 private/templates/json-mode/{@@ => __} | 0 .../{@@package.json => __package.json} | 0 .../lb6-mode/{@@Info.plist => __Info.plist} | 0 .../lb6-mode/{@@default.js => __default.js} | 0 .../love-mode/{@@conf.lua => __conf.lua} | 0 .../love-mode/{@@main.lua => __main.lua} | 0 .../templates/makefile-gmake-mode/{@@ => __} | 0 .../makefile-gmake-mode/{@@cpp => __cpp} | 0 private/templates/markdown-mode/{@@ => __} | 0 .../{@@jekyll-post => __jekyll-post} | 0 private/templates/nose-mode/{@@ => __} | 0 private/templates/php-mode/{@@ => __} | 0 .../php-mode/{@@.class.php => __.class.php} | 0 private/templates/python-mode/{@@ => __} | 0 .../python-mode/{@@setup.py => __setup.py} | 0 private/templates/rspec-mode/{@@ => __} | 0 .../rspec-mode/{@@.rspec => __.rspec} | 0 .../rspec-mode/{@@helper => __helper} | 0 private/templates/ruby-mode/{@@ => __} | 0 .../ruby-mode/{@@.gemspec => __.gemspec} | 0 .../ruby-mode/{@@Gemfile => __Gemfile} | 0 .../ruby-mode/{@@Rakefile => __Rakefile} | 0 .../ruby-mode/{@@module => __module} | 0 .../rust-mode/{@@Cargo.toml => __Cargo.toml} | 0 .../rust-mode/{@@main.rs => __main.rs} | 0 private/templates/scss-mode/{@@ => __} | 0 .../{@@master.scss => __master.scss} | 0 .../{@@normalize.scss => __normalize.scss} | 0 private/templates/sh-mode/{@@ => __} | 0 private/templates/snippet-mode/{@@ => __} | 0 .../{@@license-apache => __license-apache} | 0 .../{@@license-gpl3 => __license-gpl3} | 0 .../{@@license-mit => __license-mit} | 0 .../templates/web-mode/{@@.html => __.html} | 0 ...ekyll-layout.html => __jekyll-layout.html} | 0 48 files changed, 44 insertions(+), 44 deletions(-) rename private/templates/android-mode/{@@build.gradle => __build.gradle} (100%) rename private/templates/c++-mode/{@@.cpp => __.cpp} (100%) rename private/templates/c++-mode/{@@main.cpp => __main.cpp} (100%) rename private/templates/c++-mode/{@@winmain.cpp => __winmain.cpp} (100%) rename private/templates/c-mode/{@@.c => __.c} (100%) rename private/templates/c-mode/{@@.h => __.h} (100%) rename private/templates/emacs-lisp-mode/{@@initfile => __initfile} (100%) rename private/templates/gitignore-mode/{@@ => __} (100%) rename private/templates/go-mode/{@@.go => __.go} (100%) rename private/templates/go-mode/{@@main.go => __main.go} (100%) rename private/templates/java-mode/{@@ => __} (100%) rename private/templates/java-mode/{@@main => __main} (100%) rename private/templates/json-mode/{@@ => __} (100%) rename private/templates/json-mode/{@@package.json => __package.json} (100%) rename private/templates/lb6-mode/{@@Info.plist => __Info.plist} (100%) rename private/templates/lb6-mode/{@@default.js => __default.js} (100%) rename private/templates/love-mode/{@@conf.lua => __conf.lua} (100%) rename private/templates/love-mode/{@@main.lua => __main.lua} (100%) rename private/templates/makefile-gmake-mode/{@@ => __} (100%) rename private/templates/makefile-gmake-mode/{@@cpp => __cpp} (100%) rename private/templates/markdown-mode/{@@ => __} (100%) rename private/templates/markdown-mode/{@@jekyll-post => __jekyll-post} (100%) rename private/templates/nose-mode/{@@ => __} (100%) rename private/templates/php-mode/{@@ => __} (100%) rename private/templates/php-mode/{@@.class.php => __.class.php} (100%) rename private/templates/python-mode/{@@ => __} (100%) rename private/templates/python-mode/{@@setup.py => __setup.py} (100%) rename private/templates/rspec-mode/{@@ => __} (100%) rename private/templates/rspec-mode/{@@.rspec => __.rspec} (100%) rename private/templates/rspec-mode/{@@helper => __helper} (100%) rename private/templates/ruby-mode/{@@ => __} (100%) rename private/templates/ruby-mode/{@@.gemspec => __.gemspec} (100%) rename private/templates/ruby-mode/{@@Gemfile => __Gemfile} (100%) rename private/templates/ruby-mode/{@@Rakefile => __Rakefile} (100%) rename private/templates/ruby-mode/{@@module => __module} (100%) rename private/templates/rust-mode/{@@Cargo.toml => __Cargo.toml} (100%) rename private/templates/rust-mode/{@@main.rs => __main.rs} (100%) rename private/templates/scss-mode/{@@ => __} (100%) rename private/templates/scss-mode/{@@master.scss => __master.scss} (100%) rename private/templates/scss-mode/{@@normalize.scss => __normalize.scss} (100%) rename private/templates/sh-mode/{@@ => __} (100%) rename private/templates/snippet-mode/{@@ => __} (100%) rename private/templates/text-mode/{@@license-apache => __license-apache} (100%) rename private/templates/text-mode/{@@license-gpl3 => __license-gpl3} (100%) rename private/templates/text-mode/{@@license-mit => __license-mit} (100%) rename private/templates/web-mode/{@@.html => __.html} (100%) rename private/templates/web-mode/{@@jekyll-layout.html => __jekyll-layout.html} (100%) diff --git a/core/core-auto-insert.el b/core/core-auto-insert.el index 766cb44a7..16e6ba41d 100644 --- a/core/core-auto-insert.el +++ b/core/core-auto-insert.el @@ -10,77 +10,77 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (add-template! "/\\.gitignore$" "@@" 'gitignore-mode) + (add-template! "/\\.gitignore$" "__" 'gitignore-mode) ;; C/C++ - (add-template! "/Makefile$" "@@" 'makefile-gmake-mode) - (add-template! "/main\\.\\(cc\\|cpp\\)$" "@@main.cpp" 'c++-mode) - (add-template! "/win32_\\.\\(cc\\|cpp\\)$" "@@winmain.cpp" 'c++-mode) - (add-template! "\\.\\([Hh]\\|hpp\\)$" "@@.h" 'c++-mode) - (add-template! "\\.\\(cc\\|cpp\\)$" "@@.cpp" 'c++-mode) - (add-template! "\\.c$" "@@.c" 'c-mode) + (add-template! "/Makefile$" "__" 'makefile-gmake-mode) + (add-template! "/main\\.\\(cc\\|cpp\\)$" "__main.cpp" 'c++-mode) + (add-template! "/win32_\\.\\(cc\\|cpp\\)$" "__winmain.cpp" 'c++-mode) + (add-template! "\\.\\([Hh]\\|hpp\\)$" "__.h" 'c++-mode) + (add-template! "\\.\\(cc\\|cpp\\)$" "__.cpp" 'c++-mode) + (add-template! "\\.c$" "__.c" 'c-mode) ;; Elisp - (add-template! "\\.emacs\\.d/.+\\.el$" "@@initfile" 'emacs-lisp-mode) - (add-template! "\\.emacs\\.d/private/\\(snippets\\|templates\\)/.+$" "@@" 'snippet-mode) + (add-template! "\\.emacs\\.d/.+\\.el$" "__initfile" 'emacs-lisp-mode) + (add-template! "\\.emacs\\.d/private/\\(snippets\\|templates\\)/.+$" "__" 'snippet-mode) ;; Go - (add-template! "/main\\.go$" "@@main.go" 'go-mode t) - (add-template! "\\.go$" "@@.go" 'go-mode) + (add-template! "/main\\.go$" "__main.go" 'go-mode t) + (add-template! "\\.go$" "__.go" 'go-mode) ;; HTML - (add-template! "\\.html$" "@@.html" 'web-mode) + (add-template! "\\.html$" "___html" 'web-mode) - ;; Java - (add-template! "/src/.+/.+\\.java$" "@@" 'java-mode) - (add-template! "/main\\.java$" "@@main" 'java-mode) - (add-template! "/build\\.gradle$" "@@build.gradle" 'android-mode) + ;; java + (add-template! "/src/.+/.+\\.java$" "__" 'java-mode) + (add-template! "/main\\.java$" "__main" 'java-mode) + (add-template! "/build\\.gradle$" "__build.gradle" 'android-mode) ;; Javascript - (add-template! "\\.lbaction/.+/Info.plist$" "@@Info.plst" 'lb6-mode) - (add-template! "\\.lbaction/.+/\\(default\\|suggestions\\)\\.js$" "@@default.js" 'lb6-mode) - (add-template! "/package\\.json$" "@@package.json" 'json-mode) - (add-template! "\\.\\(json\\|jshintrc\\)$" "@@" 'json-mode) + (add-template! "\\.lbaction/.+/Info.plist$" "__Info.plst" 'lb6-mode) + (add-template! "\\.lbaction/.+/\\(default\\|suggestions\\)\\.js$" "__default.js" 'lb6-mode) + (add-template! "/package\\.json$" "__package.json" 'json-mode) + (add-template! "\\.\\(json\\|jshintrc\\)$" "__" 'json-mode) ;; Lua - (add-template! "/main\\.lua$" "@@main.lua" 'love-mode) - (add-template! "/conf\\.lua$" "@@conf.lua" 'love-mode) + (add-template! "/main\\.lua$" "__main.lua" 'love-mode) + (add-template! "/conf\\.lua$" "__conf.lua" 'love-mode) ;; Markdown - (add-template! "\\.md$" "@@" 'markdown-mode) - (add-template! "/_posts/.+\\.md$" "@@jekyll-post" 'markdown-mode) - (add-template! "/_layouts/.+\\.html$" "@@jekyll-layout.html" 'web-mode) + (add-template! "\\.md$" "__" 'markdown-mode) + (add-template! "/_posts/.+\\.md$" "__jekyll-post" 'markdown-mode) + (add-template! "/_layouts/.+\\.html$" "__jekyll-layout.html" 'web-mode) ;; PHP - (add-template! "\\.class\\.php$" "@@.class.php" 'php-mode) - (add-template! "\\.php$" "@@" 'php-mode) + (add-template! "\\.class\\.php$" "__.class.php" 'php-mode) + (add-template! "\\.php$" "__" 'php-mode) ;; Python - ;; (add-template! "tests?/test_.+\\.py$" "@@" 'nose-mode) - ;; (add-template! "/setup\\.py$" "@@setup.py" 'python-mode) - (add-template! "\\.py$" "@@" 'python-mode) + ;; (add-template! "tests?/test_.+\\.py$" "__" 'nose-mode) + ;; (add-template! "/setup\\.py$" "__setup.py" 'python-mode) + (add-template! "\\.py$" "__" 'python-mode) ;; Ruby - (add-template! "/\\.rspec$" "@@.rspec" 'rspec-mode) - (add-template! "/spec_helper\\.rb$" "@@helper" 'rspec-mode t) - (add-template! "_spec\\.rb$" "@@" 'rspec-mode t) - (add-template! "/Rakefile$" "@@Rakefile" 'enh-ruby-mode t) - (add-template! "/Gemfile$" "@@Gemfile" 'enh-ruby-mode t) - (add-template! "\\.gemspec$" "@@.gemspec" 'enh-ruby-mode t) - (add-template! "/lib/.+\\.rb$" "@@module" 'enh-ruby-mode t) - (add-template! "\\.rb$" "@@" 'enh-ruby-mode) + (add-template! "/\\.rspec$" "__.rspec" 'rspec-mode) + (add-template! "/spec_helper\\.rb$" "__helper" 'rspec-mode t) + (add-template! "_spec\\.rb$" "__" 'rspec-mode t) + (add-template! "/Rakefile$" "__Rakefile" 'enh-ruby-mode t) + (add-template! "/Gemfile$" "__Gemfile" 'enh-ruby-mode t) + (add-template! "\\.gemspec$" "__.gemspec" 'enh-ruby-mode t) + (add-template! "/lib/.+\\.rb$" "__module" 'enh-ruby-mode t) + (add-template! "\\.rb$" "__" 'enh-ruby-mode) ;; Rust - (add-template! "/Cargo.toml$" "@@Cargo.toml" 'rust-mode) - (add-template! "/main\\.rs$" "@@main.rs" 'rust-mode) + (add-template! "/Cargo.toml$" "__Cargo.toml" 'rust-mode) + (add-template! "/main\\.rs$" "__main.rs" 'rust-mode) ;; SCSS - (add-template! "/master\\.scss$" "@@master.scss" 'scss-mode) - (add-template! "/normalize\\.scss$" "@@normalize.scss" 'scss-mode) - (add-template! "\\.scss$" "@@" 'scss-mode) + (add-template! "/master\\.scss$" "__master.scss" 'scss-mode) + (add-template! "/normalize\\.scss$" "__normalize.scss" 'scss-mode) + (add-template! "\\.scss$" "__" 'scss-mode) ;; Shell scripts - (add-template! "\\.z?sh$" "@@" 'sh-mode) + (add-template! "\\.z?sh$" "__" 'sh-mode) ) (provide 'core-auto-insert) diff --git a/private/templates/android-mode/@@build.gradle b/private/templates/android-mode/__build.gradle similarity index 100% rename from private/templates/android-mode/@@build.gradle rename to private/templates/android-mode/__build.gradle diff --git a/private/templates/c++-mode/@@.cpp b/private/templates/c++-mode/__.cpp similarity index 100% rename from private/templates/c++-mode/@@.cpp rename to private/templates/c++-mode/__.cpp diff --git a/private/templates/c++-mode/@@main.cpp b/private/templates/c++-mode/__main.cpp similarity index 100% rename from private/templates/c++-mode/@@main.cpp rename to private/templates/c++-mode/__main.cpp diff --git a/private/templates/c++-mode/@@winmain.cpp b/private/templates/c++-mode/__winmain.cpp similarity index 100% rename from private/templates/c++-mode/@@winmain.cpp rename to private/templates/c++-mode/__winmain.cpp diff --git a/private/templates/c-mode/@@.c b/private/templates/c-mode/__.c similarity index 100% rename from private/templates/c-mode/@@.c rename to private/templates/c-mode/__.c diff --git a/private/templates/c-mode/@@.h b/private/templates/c-mode/__.h similarity index 100% rename from private/templates/c-mode/@@.h rename to private/templates/c-mode/__.h diff --git a/private/templates/emacs-lisp-mode/@@initfile b/private/templates/emacs-lisp-mode/__initfile similarity index 100% rename from private/templates/emacs-lisp-mode/@@initfile rename to private/templates/emacs-lisp-mode/__initfile diff --git a/private/templates/gitignore-mode/@@ b/private/templates/gitignore-mode/__ similarity index 100% rename from private/templates/gitignore-mode/@@ rename to private/templates/gitignore-mode/__ diff --git a/private/templates/go-mode/@@.go b/private/templates/go-mode/__.go similarity index 100% rename from private/templates/go-mode/@@.go rename to private/templates/go-mode/__.go diff --git a/private/templates/go-mode/@@main.go b/private/templates/go-mode/__main.go similarity index 100% rename from private/templates/go-mode/@@main.go rename to private/templates/go-mode/__main.go diff --git a/private/templates/java-mode/@@ b/private/templates/java-mode/__ similarity index 100% rename from private/templates/java-mode/@@ rename to private/templates/java-mode/__ diff --git a/private/templates/java-mode/@@main b/private/templates/java-mode/__main similarity index 100% rename from private/templates/java-mode/@@main rename to private/templates/java-mode/__main diff --git a/private/templates/json-mode/@@ b/private/templates/json-mode/__ similarity index 100% rename from private/templates/json-mode/@@ rename to private/templates/json-mode/__ diff --git a/private/templates/json-mode/@@package.json b/private/templates/json-mode/__package.json similarity index 100% rename from private/templates/json-mode/@@package.json rename to private/templates/json-mode/__package.json diff --git a/private/templates/lb6-mode/@@Info.plist b/private/templates/lb6-mode/__Info.plist similarity index 100% rename from private/templates/lb6-mode/@@Info.plist rename to private/templates/lb6-mode/__Info.plist diff --git a/private/templates/lb6-mode/@@default.js b/private/templates/lb6-mode/__default.js similarity index 100% rename from private/templates/lb6-mode/@@default.js rename to private/templates/lb6-mode/__default.js diff --git a/private/templates/love-mode/@@conf.lua b/private/templates/love-mode/__conf.lua similarity index 100% rename from private/templates/love-mode/@@conf.lua rename to private/templates/love-mode/__conf.lua diff --git a/private/templates/love-mode/@@main.lua b/private/templates/love-mode/__main.lua similarity index 100% rename from private/templates/love-mode/@@main.lua rename to private/templates/love-mode/__main.lua diff --git a/private/templates/makefile-gmake-mode/@@ b/private/templates/makefile-gmake-mode/__ similarity index 100% rename from private/templates/makefile-gmake-mode/@@ rename to private/templates/makefile-gmake-mode/__ diff --git a/private/templates/makefile-gmake-mode/@@cpp b/private/templates/makefile-gmake-mode/__cpp similarity index 100% rename from private/templates/makefile-gmake-mode/@@cpp rename to private/templates/makefile-gmake-mode/__cpp diff --git a/private/templates/markdown-mode/@@ b/private/templates/markdown-mode/__ similarity index 100% rename from private/templates/markdown-mode/@@ rename to private/templates/markdown-mode/__ diff --git a/private/templates/markdown-mode/@@jekyll-post b/private/templates/markdown-mode/__jekyll-post similarity index 100% rename from private/templates/markdown-mode/@@jekyll-post rename to private/templates/markdown-mode/__jekyll-post diff --git a/private/templates/nose-mode/@@ b/private/templates/nose-mode/__ similarity index 100% rename from private/templates/nose-mode/@@ rename to private/templates/nose-mode/__ diff --git a/private/templates/php-mode/@@ b/private/templates/php-mode/__ similarity index 100% rename from private/templates/php-mode/@@ rename to private/templates/php-mode/__ diff --git a/private/templates/php-mode/@@.class.php b/private/templates/php-mode/__.class.php similarity index 100% rename from private/templates/php-mode/@@.class.php rename to private/templates/php-mode/__.class.php diff --git a/private/templates/python-mode/@@ b/private/templates/python-mode/__ similarity index 100% rename from private/templates/python-mode/@@ rename to private/templates/python-mode/__ diff --git a/private/templates/python-mode/@@setup.py b/private/templates/python-mode/__setup.py similarity index 100% rename from private/templates/python-mode/@@setup.py rename to private/templates/python-mode/__setup.py diff --git a/private/templates/rspec-mode/@@ b/private/templates/rspec-mode/__ similarity index 100% rename from private/templates/rspec-mode/@@ rename to private/templates/rspec-mode/__ diff --git a/private/templates/rspec-mode/@@.rspec b/private/templates/rspec-mode/__.rspec similarity index 100% rename from private/templates/rspec-mode/@@.rspec rename to private/templates/rspec-mode/__.rspec diff --git a/private/templates/rspec-mode/@@helper b/private/templates/rspec-mode/__helper similarity index 100% rename from private/templates/rspec-mode/@@helper rename to private/templates/rspec-mode/__helper diff --git a/private/templates/ruby-mode/@@ b/private/templates/ruby-mode/__ similarity index 100% rename from private/templates/ruby-mode/@@ rename to private/templates/ruby-mode/__ diff --git a/private/templates/ruby-mode/@@.gemspec b/private/templates/ruby-mode/__.gemspec similarity index 100% rename from private/templates/ruby-mode/@@.gemspec rename to private/templates/ruby-mode/__.gemspec diff --git a/private/templates/ruby-mode/@@Gemfile b/private/templates/ruby-mode/__Gemfile similarity index 100% rename from private/templates/ruby-mode/@@Gemfile rename to private/templates/ruby-mode/__Gemfile diff --git a/private/templates/ruby-mode/@@Rakefile b/private/templates/ruby-mode/__Rakefile similarity index 100% rename from private/templates/ruby-mode/@@Rakefile rename to private/templates/ruby-mode/__Rakefile diff --git a/private/templates/ruby-mode/@@module b/private/templates/ruby-mode/__module similarity index 100% rename from private/templates/ruby-mode/@@module rename to private/templates/ruby-mode/__module diff --git a/private/templates/rust-mode/@@Cargo.toml b/private/templates/rust-mode/__Cargo.toml similarity index 100% rename from private/templates/rust-mode/@@Cargo.toml rename to private/templates/rust-mode/__Cargo.toml diff --git a/private/templates/rust-mode/@@main.rs b/private/templates/rust-mode/__main.rs similarity index 100% rename from private/templates/rust-mode/@@main.rs rename to private/templates/rust-mode/__main.rs diff --git a/private/templates/scss-mode/@@ b/private/templates/scss-mode/__ similarity index 100% rename from private/templates/scss-mode/@@ rename to private/templates/scss-mode/__ diff --git a/private/templates/scss-mode/@@master.scss b/private/templates/scss-mode/__master.scss similarity index 100% rename from private/templates/scss-mode/@@master.scss rename to private/templates/scss-mode/__master.scss diff --git a/private/templates/scss-mode/@@normalize.scss b/private/templates/scss-mode/__normalize.scss similarity index 100% rename from private/templates/scss-mode/@@normalize.scss rename to private/templates/scss-mode/__normalize.scss diff --git a/private/templates/sh-mode/@@ b/private/templates/sh-mode/__ similarity index 100% rename from private/templates/sh-mode/@@ rename to private/templates/sh-mode/__ diff --git a/private/templates/snippet-mode/@@ b/private/templates/snippet-mode/__ similarity index 100% rename from private/templates/snippet-mode/@@ rename to private/templates/snippet-mode/__ diff --git a/private/templates/text-mode/@@license-apache b/private/templates/text-mode/__license-apache similarity index 100% rename from private/templates/text-mode/@@license-apache rename to private/templates/text-mode/__license-apache diff --git a/private/templates/text-mode/@@license-gpl3 b/private/templates/text-mode/__license-gpl3 similarity index 100% rename from private/templates/text-mode/@@license-gpl3 rename to private/templates/text-mode/__license-gpl3 diff --git a/private/templates/text-mode/@@license-mit b/private/templates/text-mode/__license-mit similarity index 100% rename from private/templates/text-mode/@@license-mit rename to private/templates/text-mode/__license-mit diff --git a/private/templates/web-mode/@@.html b/private/templates/web-mode/__.html similarity index 100% rename from private/templates/web-mode/@@.html rename to private/templates/web-mode/__.html diff --git a/private/templates/web-mode/@@jekyll-layout.html b/private/templates/web-mode/__jekyll-layout.html similarity index 100% rename from private/templates/web-mode/@@jekyll-layout.html rename to private/templates/web-mode/__jekyll-layout.html