[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c845c43 097/173: Revert "Add support for company-face"
From: |
Dmitry Gutov |
Subject: |
[elpa] master c845c43 097/173: Revert "Add support for company-face" |
Date: |
Thu, 23 Jun 2016 00:28:42 +0000 (UTC) |
branch: master
commit c845c43aaa6cfc42e8b4a8eeaa370aa85caf02f2
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Revert "Add support for company-face"
This reverts commit 900ae0d7a2270ea1d2ea00567e80a619333fd4e5.
---
company.el | 16 ----------------
test/frontends-tests.el | 25 -------------------------
2 files changed, 41 deletions(-)
diff --git a/company.el b/company.el
index 18cd2e3..498920a 100644
--- a/company.el
+++ b/company.el
@@ -2405,7 +2405,6 @@ If SHOW-VERSION is non-nil, show the version in the echo
area."
'(face company-tooltip-common-selection
mouse-face company-tooltip-selection)
line)))
- (company--apply-company-face line)
line))
(defun company--search-chunks ()
@@ -2418,21 +2417,6 @@ If SHOW-VERSION is non-nil, show the version in the echo
area."
(push (cons (car md) (cadr md)) res))))
res))
-(defun company--apply-company-face (str)
- (let ((start (if (get-text-property 0 'company-face str)
- 0
- (next-single-property-change 0 'company-face str)))
- end value)
- (while start
- (setq end (or (next-single-property-change start 'company-face str)
- (length str)))
- (setq value (get-text-property start 'company-face str))
- (font-lock-prepend-text-property start end 'face value str)
- (font-lock-prepend-text-property start end 'mouse-face value str)
- (setq start (next-single-property-change end 'company-face str)))
- (when end
- (remove-text-properties 0 end '(company-face) str))))
-
(defun company--clean-string (str)
(replace-regexp-in-string
"\\([^[:graph:] ]\\)\\|\\(\ufeff\\)\\|[[:multibyte:]]"
diff --git a/test/frontends-tests.el b/test/frontends-tests.el
index b35fe76..7348cbd 100644
--- a/test/frontends-tests.el
+++ b/test/frontends-tests.el
@@ -265,31 +265,6 @@
#(" bar "
0 5 (face company-tooltip mouse-face company-tooltip-mouse))))))
-(ert-deftest company-fill-propertize-uses-company-face ()
- (let ((company-backend #'ignore)
- (company-prefix "")
- (str1 "str1")
- (str2 "str2"))
- (put-text-property 0 3 'company-face 'boo str1)
- (put-text-property 1 4 'company-face 'boo str2)
- (let ((res (company-fill-propertize str1 nil 10 nil nil nil)))
- ;; `equal-including-properties' uses `eq' for properties.
- (equal-including-properties
- (substring res 3 10)
- #(" " 0 6 (face company-tooltip mouse-face company-tooltip-mouse)))
- (should (equal (get-text-property 0 'face res)
- '(boo company-tooltip)))
- (should (equal (get-text-property 2 'mouse-face res)
- '(boo company-tooltip-mouse))))
- (let ((res (company-fill-propertize str2 nil 4 nil nil nil)))
- (equal-including-properties
- (substring res 0 1)
- #("s" 0 1 (face company-tooltip mouse-face company-tooltip-mouse)))
- (should (equal (get-text-property 1 'face res)
- '(boo company-tooltip)))
- (should (equal (get-text-property 3 'mouse-face res)
- '(boo company-tooltip-mouse))))))
-
(ert-deftest company-column-with-composition ()
:tags '(interactive)
(with-temp-buffer
- [elpa] master 900ae0d 096/173: Add support for company-face, (continued)
- [elpa] master 900ae0d 096/173: Add support for company-face, Dmitry Gutov, 2016/06/22
- [elpa] master 1221739 122/173: Improve the description of cons prefix, Dmitry Gutov, 2016/06/22
- [elpa] master ac7f816 134/173: Merge pull request #466 from tarsius/patch-1, Dmitry Gutov, 2016/06/22
- [elpa] master 9e844d1 124/173: Merge pull request #459 from fbergroth/prefix-length-var, Dmitry Gutov, 2016/06/22
- [elpa] master 31780fb 114/173: Revert "company-cancel: Call frontends' 'hide before 'post-completion", Dmitry Gutov, 2016/06/22
- [elpa] master a7e4408 152/173: Merge pull request #491 from akirakyle/patch-1, Dmitry Gutov, 2016/06/22
- [elpa] master 2dd1f6a 112/173: company-cancel: Call frontends' 'hide before 'post-completion, Dmitry Gutov, 2016/06/22
- [elpa] master dc4927b 158/173: Allow company-dabbrev-ignore-buffers to be a function, Dmitry Gutov, 2016/06/22
- [elpa] master 3f1afc6 171/173: Revert "Remove the [return] binding (#530)", Dmitry Gutov, 2016/06/22
- [elpa] master 9fb6072 116/173: Reimplement -electric-do using a pre-command-hook, Dmitry Gutov, 2016/06/22
- [elpa] master c845c43 097/173: Revert "Add support for company-face",
Dmitry Gutov <=
- [elpa] master e477eaf 107/173: Bump copyright years, Dmitry Gutov, 2016/06/22
- [elpa] master 7a05d1c 115/173: company-cancel: Call pre/post-completion at the end, Dmitry Gutov, 2016/06/22
- [elpa] master cd69d7b 119/173: Add company-semantic-begin-after-member-access, Dmitry Gutov, 2016/06/22
- [elpa] master 724e6dd 136/173: Delete the cache when async completion aborts, Dmitry Gutov, 2016/06/22
- [elpa] master e251568 137/173: Update test for the latest change, Dmitry Gutov, 2016/06/22
- [elpa] master 7afffbc 068/173: Spell "backend" and "frontend" without hyphens, Dmitry Gutov, 2016/06/22
- [elpa] master 5565541 126/173: Option to have tempo expand tags after completion., Dmitry Gutov, 2016/06/22
- [elpa] master ec9f6c7 127/173: Moved company-tempo-insert call to post-completion, Dmitry Gutov, 2016/06/22
- [elpa] master bdf6b22 138/173: Fix #474 by filtering dabbrev completions at the end, Dmitry Gutov, 2016/06/22
- [elpa] master e65ab4c 111/173: Merge pull request #453 from jtatarik/bbdb-multiple-recipients, Dmitry Gutov, 2016/06/22