Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
mopemope committed Jan 9, 2019
2 parents 4914ab1 + 6590f7a commit 42008f3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
7 changes: 7 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Version 1.0.11 (2019-01-09)

* Improve completion order.
* Support annotaion value completion.
* Fix column position bug (thanks @Jeanhwea)
* Fix some bugs and improve stability.

# Version 1.0.10 (2018-11-16)

* Add hooks after a test is executed. (thanks @roman)
Expand Down
10 changes: 7 additions & 3 deletions meghanada.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
;; Author: Yutaka Matsubara ([email protected])
;; Homepage: https://github.com/mopemope/meghanada-emacs
;; Keywords: languages java
;; Package-Version: 1.0.10
;; Package-Version: 1.0.11
;; Package-Requires: ((emacs "24.3") (yasnippet "0.6.1") (company "0.9.0") (flycheck "0.23"))

;; This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -48,7 +48,7 @@
;; Const
;;

(defconst meghanada-version "1.0.10")
(defconst meghanada-version "1.0.11")
(defconst meghanada-setup-version "0.0.2")
(defconst meghanada--eot "\n;;EOT\n")
(defconst meghanada--junit-buf-name "*meghanada-junit*")
Expand Down Expand Up @@ -261,9 +261,13 @@ In linux or macOS, it can be \"mvn\"; In Windows, it can be \"mvn.cmd\". "
"TODO: FIX DOC ."
(format-mode-line "%l"))

(defun meghanada--real-current-column ()
"like `current-column', but skip invisible characters in pretty-symbol-mode."
(- (point) (line-beginning-position)))

(defun meghanada--what-column ()
"TODO: FIX DOC ."
(number-to-string (1+ (current-column))))
(number-to-string (1+ (meghanada--real-current-column))))

(defun meghanada--what-symbol ()
"TODO: FIX DOC ."
Expand Down

0 comments on commit 42008f3

Please sign in to comment.