[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 75e21f6 045/173: company-css: Support web-mode
From: |
Dmitry Gutov |
Subject: |
[elpa] master 75e21f6 045/173: company-css: Support web-mode |
Date: |
Thu, 23 Jun 2016 00:28:37 +0000 (UTC) |
branch: master
commit 75e21f6ddc2a826c6ec74312d2e725a1a827385e
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
company-css: Support web-mode
Closes #363
---
company-css.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/company-css.el b/company-css.el
index ec48653..28f6c2d 100644
--- a/company-css.el
+++ b/company-css.el
@@ -26,6 +26,8 @@
(require 'company)
(require 'cl-lib)
+(declare-function web-mode-language-at-pos "web-mode" (&optional pos))
+
(defconst company-css-property-alist
;; see http://www.w3.org/TR/CSS21/propidx.html
'(("azimuth" angle "left-side" "far-left" "left" "center-left" "center"
@@ -415,7 +417,9 @@ Returns \"\" if no property found, but feasible at this
position."
(interactive (list 'interactive))
(cl-case command
(interactive (company-begin-backend 'company-css))
- (prefix (and (derived-mode-p 'css-mode)
+ (prefix (and (or (derived-mode-p 'css-mode)
+ (and (derived-mode-p 'web-mode)
+ (string= (web-mode-language-at-pos) "css")))
(or (company-grab company-css-tag-regexp 1)
(company-grab company-css-pseudo-regexp 1)
(company-grab company-css-property-value-regexp 2)
- [elpa] master 3726fe2 093/173: [ci skip] Use the "generic" language, (continued)
- [elpa] master 3726fe2 093/173: [ci skip] Use the "generic" language, Dmitry Gutov, 2016/06/22
- [elpa] master 946c798 095/173: Handle empty list of candidates, Dmitry Gutov, 2016/06/22
- [elpa] master c656b25 079/173: Merge pull request #418 from PythonNut/master, Dmitry Gutov, 2016/06/22
- [elpa] master 931e758 101/173: Fix the workaround, Dmitry Gutov, 2016/06/22
- [elpa] master 049b0e6 048/173: company--begin-new: Check the value of c, Dmitry Gutov, 2016/06/22
- [elpa] master 250ca1c 088/173: Add company-etags-everywhere, Dmitry Gutov, 2016/06/22
- [elpa] master 21da29b 082/173: Update copyright, Dmitry Gutov, 2016/06/22
- [elpa] master cec8779 075/173: Introduce company-search-regexp-function, Dmitry Gutov, 2016/06/22
- [elpa] master 6165cb2 083/173: Don't "adjust key" (#422), Dmitry Gutov, 2016/06/22
- [elpa] master e5177c9 105/173: Add company-tooltip-annotation-selection face, Dmitry Gutov, 2016/06/22
- [elpa] master 75e21f6 045/173: company-css: Support web-mode,
Dmitry Gutov <=
- [elpa] master e6ea779 004/173: Add `company-diag', Dmitry Gutov, 2016/06/22
- [elpa] master 0b37d17 044/173: company-mode: Mention the sorting order, Dmitry Gutov, 2016/06/22
- [elpa] master c6af7d2 061/173: Mention the previous change in NEWS [ci skip], Dmitry Gutov, 2016/06/22
- [elpa] master 5d68a50 069/173: [Fix #317] Allow :sorted keyword in grouped backends, Dmitry Gutov, 2016/06/22
- [elpa] master 87351aa 073/173: Double space, Dmitry Gutov, 2016/06/22
- [elpa] master 8952cfe 085/173: Handle key prefix being shorter than prefix (#422), Dmitry Gutov, 2016/06/22
- [elpa] master c2e5981 017/173: Remove company-ropemacs, Dmitry Gutov, 2016/06/22
- [elpa] master d97c98f 076/173: company-search-candidates: Mention company-search-regexp-function, Dmitry Gutov, 2016/06/22
- [elpa] master 2306c9c 054/173: Support whitespace-mode newline-mark, Dmitry Gutov, 2016/06/22
- [elpa] master 4a16a55 090/173: company-dabbrev--make-regexp: Regexp can match non-word characters, Dmitry Gutov, 2016/06/22