From 53eb32ea163bd4421b222e55e09306f48ab3d116 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Wed, 6 May 2020 18:24:10 +0900 Subject: [PATCH 1/2] Fix Java file templates --- modules/editor/file-templates/templates/java-mode/__ | 4 ++-- modules/editor/file-templates/templates/java-mode/__main | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/editor/file-templates/templates/java-mode/__ b/modules/editor/file-templates/templates/java-mode/__ index 2f45b0ca0..180f0a143 100644 --- a/modules/editor/file-templates/templates/java-mode/__ +++ b/modules/editor/file-templates/templates/java-mode/__ @@ -1,9 +1,9 @@ # -*- mode: snippet -*- # name: Java file template # -- -package `(yas-java-project-package)`; +package `(+java-current-package)`; -public class `(yas-java-class-name)` $1 +public class `(+java-current-class)` $1 { $0 } diff --git a/modules/editor/file-templates/templates/java-mode/__main b/modules/editor/file-templates/templates/java-mode/__main index 20dde1223..748a9d96c 100644 --- a/modules/editor/file-templates/templates/java-mode/__main +++ b/modules/editor/file-templates/templates/java-mode/__main @@ -1,9 +1,9 @@ # -*- mode: snippet -*- # name: Java MAIN file template # -- -package `(yas-java-project-package)`; +package `(+java-current-package)`; -public class `(yas-java-class-name)` $1 +public class `(+java-current-class)` $1 { public static void main(String[] args) { $0 From b8e85a42c7a267891aec37ac893162d22799eb5a Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Thu, 7 May 2020 08:28:12 +0900 Subject: [PATCH 2/2] Remove .yas-setup.el for java-mode --- .../file-templates/templates/java-mode/.yas-setup.el | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 modules/editor/file-templates/templates/java-mode/.yas-setup.el diff --git a/modules/editor/file-templates/templates/java-mode/.yas-setup.el b/modules/editor/file-templates/templates/java-mode/.yas-setup.el deleted file mode 100644 index b00feed7e..000000000 --- a/modules/editor/file-templates/templates/java-mode/.yas-setup.el +++ /dev/null @@ -1,9 +0,0 @@ -(defun yas-java-project-package () - (or (and (eq major-mode 'java-mode) - (+java-current-package)) - "")) - -(defun yas-java-class-name () - (or (and (eq major-mode 'java-mode) - (+java-current-class)) - ""))