From 342a4729058b8cb8a6bde4b8ba32d02fe3d40a25 Mon Sep 17 00:00:00 2001 From: Joar Esteban Buitrago Carrillo Date: Sun, 20 Jun 2021 23:45:27 -0500 Subject: [PATCH 1/3] Fix error when init or check when classes on Fix #3 --- languagetool.el | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/languagetool.el b/languagetool.el index 7deb7e3..0eb5dc5 100644 --- a/languagetool.el +++ b/languagetool.el @@ -263,7 +263,9 @@ Its not recommended to run this function more than once." (error "Java could not be found")) (unless languagetool-server-language-tool-jar (error "LanguageTool Server jar path is not set")) - (unless (file-readable-p languagetool-server-language-tool-jar) + (unless (or + languagetool-language-tool-class + (file-readable-p languagetool-server-language-tool-jar)) (error "LanguageTool Server jar is not readable or could not be found")) (let ((buffer (get-buffer-create languagetool-server-output-buffer-name))) @@ -273,15 +275,11 @@ Its not recommended to run this function more than once." ;; Start LanguageTool Server (setq languagetool-server-process - (start-process "*LanguageTool Server*" - buffer - languagetool-java-bin - (string-join languagetool-java-arguments " ") - "-cp" - languagetool-server-language-tool-jar - "org.languagetool.server.HTTPServer" - "--port" - (format "%d" languagetool-server-port))) + (apply #'start-process + "*LanguageTool Server*" + buffer + languagetool-java-bin + (languagetool-server--init-args))) ;; Does not block Emacs when close and do not shutdown the server (set-process-query-on-exit-flag languagetool-server-process nil)) @@ -291,6 +289,28 @@ Its not recommended to run this function more than once." (run-with-idle-timer languagetool-hint-idle-delay t languagetool-hint-function)))) +(defun languagetool-server--init-args () + "Parse the arguments needed to start HTTP server." + (let ((arguments nil)) + + ;; Appends arguments given to java + (dolist (arg languagetool-java-arguments) + (setq arguments (append arguments (list arg)))) + + ;; Appends the LanguageTool Server jar path + (unless languagetool-language-tool-class + (setq arguments (append arguments (list "-cp")))) + (setq arguments (append arguments (list languagetool-server-language-tool-jar))) + (unless languagetool-language-tool-class + (setq arguments (append arguments (list "org.languagetool.server.HTTPServer")))) + + ;; Appends the port information + (setq arguments (append arguments + (list "--port" + (format "%d" languagetool-server-port)))) + + arguments)) + ;;;###autoload (defun languagetool-server-stop () "Stops the LanguageTool Server." @@ -584,7 +604,9 @@ The region is delimited by BEGIN and END." (error "Java could not be found")) (unless languagetool-language-tool-jar (error "LanguageTool jar path is not set")) - (unless (file-readable-p languagetool-language-tool-jar) + (unless (or + languagetool-language-tool-class + (file-readable-p languagetool-language-tool-jar)) (error "LanguageTool jar is not readable or could not be found")) (save-excursion From c5e05c67489a88577664edb9233417c06839b057 Mon Sep 17 00:00:00 2001 From: Joar Esteban Buitrago Carrillo Date: Sun, 20 Jun 2021 23:48:57 -0500 Subject: [PATCH 2/3] Update ChangeLog --- ChangeLog.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 5c51244..c6fe620 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -12,6 +12,8 @@ link:https://semver.org/spec/v2.0.0.html[Semantic Versioning]. == [Unreleased] +=== Fixed +* Error when checking with classes on. (Fix #3) == [0.4.1] === Fixed From e505a9fd2b08f80421b5794e585c652924c19eec Mon Sep 17 00:00:00 2001 From: Joar Esteban Buitrago Carrillo Date: Sun, 20 Jun 2021 23:52:39 -0500 Subject: [PATCH 3/3] Jump to version 0.4.2 --- ChangeLog.adoc | 2 ++ ReadMe.adoc | 2 +- languagetool-issue-faces.el | 2 +- languagetool.el | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index c6fe620..983d5f1 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -12,6 +12,8 @@ link:https://semver.org/spec/v2.0.0.html[Semantic Versioning]. == [Unreleased] + +== [0.4.2] === Fixed * Error when checking with classes on. (Fix #3) diff --git a/ReadMe.adoc b/ReadMe.adoc index 76ea51e..edba191 100644 --- a/ReadMe.adoc +++ b/ReadMe.adoc @@ -1,6 +1,6 @@ = languagetool.el Joar Buitago -v0.4.1, 2020-01-21 +v0.4.2, 2020-01-21 [.text-center] -- diff --git a/languagetool-issue-faces.el b/languagetool-issue-faces.el index 472177e..ce0f726 100644 --- a/languagetool-issue-faces.el +++ b/languagetool-issue-faces.el @@ -5,7 +5,7 @@ ;; Author: Joar Buitrago ;; Keywords: grammar text docs tools convenience checker ;; URL: https://github.com/PillFall/Emacs-LanguageTool.el -;; Version: 0.4.1 +;; Version: 0.4.2 ;; Package-Requires: ((emacs "25.1") (request "0.3.2")) ;; This program is free software; you can redistribute it and/or modify diff --git a/languagetool.el b/languagetool.el index 0eb5dc5..89ac8bc 100644 --- a/languagetool.el +++ b/languagetool.el @@ -5,7 +5,7 @@ ;; Author: Joar Buitrago ;; Keywords: grammar text docs tools convenience checker ;; URL: https://github.com/PillFall/Emacs-LanguageTool.el -;; Version: 0.4.1 +;; Version: 0.4.2 ;; Package-Requires: ((emacs "25.1") (request "0.3.2")) ;; This program is free software; you can redistribute it and/or modify