Begin id completion

Ecmel Ercan · Ecmel Ercan · commit 1747dc794979 · 2016-08-11T16:41:08.000+03:00
diff --git a/src/extension.ts b/src/extension.ts
@@ -10,7 +10,9 @@ import * as path from 'path';
 
 let service = css.getCSSLanguageService();
 let map: { [index: string]: vsc.CompletionItem[]; } = {};
-let regex = /[.]([\w-]+)/g;
+let regex = /[\.\#]([\w-]+)/g;
+let dot = vsc.CompletionItemKind.Class;
+let hash = vsc.CompletionItemKind.Reference;
 
 class Snippet {
 
@@ -129,7 +131,9 @@ class ClassServer implements vsc.CompletionItemProvider {
 
       let ci: vsc.CompletionItem[] = [];
       for (let item in items) {
-        ci.push(items[item]);
+        if (items[item].kind === dot) {
+          ci.push(items[item]);
+        }
       }
       return new vsc.CompletionList(ci);
     }
@@ -150,6 +154,7 @@ function pushSymbols(key: string, symbols: lst.SymbolInformation[]): void {
     let symbol;
     while (symbol = regex.exec(symbols[i].name)) {
       let item = new vsc.CompletionItem(symbol[1]);
+      item.kind = symbol[0].startsWith('.') ? dot : hash;
       ci.push(item);
     }
   }
diff --git a/test/test .cshtml b/test/test .cshtml
@@ -10,15 +10,21 @@
     .test2 .test3 {
       color: gray;
     }
+
+    #test4 {
+      color: red;
+    }
   </style>
 </head>
 
 <body>
-  <a href="#" style="color: white; background-color: ghostwhite;" class="external">TEST</a>
-  <a href="#" style="
+  <a href="#" id="external-test" style="color: white; background-color: ghostwhite;" class="external">TEST</a>
+  <a href="#" 
+  id="test4"
+  style="
     color: white; 
-    background-color: ghostwhite;
-  " class="
+    background-color: ghostwhite;" 
+  class="
   external 
   test
   ">TEST</a>
diff --git a/test/test.blade.php b/test/test.blade.php
@@ -1,11 +1,33 @@
 <html>
+
 <head>
-<style>
-.test {
-  color: red;
-}
-</style>
+  <style>
+    .test {
+      color: red;
+      background-color: blue;
+    }
+    
+    .test2 .test3 {
+      color: gray;
+    }
+
+    #test4 {
+      color: red;
+    }
+  </style>
 </head>
-<body class="external test">
+
+<body>
+  <a href="#" id="external-test" style="color: white; background-color: ghostwhite;" class="external">TEST</a>
+  <a href="#" 
+  id="test4"
+  style="
+    color: white; 
+    background-color: ghostwhite;" 
+  class="
+  external 
+  test
+  ">TEST</a>
 </body>
+
 </html>
diff --git a/test/test.css b/test/test.css
@@ -1,4 +1,9 @@
   .external {
     color: red;
     background-color: blue;
+  }
+
+  #external-test {
+    color: red;
+    background-color: blue;
   }
diff --git a/test/test.html b/test/test.html
@@ -10,15 +10,21 @@
     .test2 .test3 {
       color: gray;
     }
+
+    #test4 {
+      color: red;
+    }
   </style>
 </head>
 
 <body>
-  <a href="#" style="color: white; background-color: ghostwhite;" class="external">TEST</a>
-  <a href="#" style="
+  <a href="#" id="external-test" style="color: white; background-color: ghostwhite;" class="external">TEST</a>
+  <a href="#" 
+  id="test4"
+  style="
     color: white; 
-    background-color: ghostwhite;
-  " class="
+    background-color: ghostwhite;" 
+  class="
   external 
   test
   ">TEST</a>

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@ import * as path from 'path';`
`10`	`10`
`11`	`11`	`let service = css.getCSSLanguageService();`
`12`	`12`	`let map: { [index: string]: vsc.CompletionItem[]; } = {};`
`13`		`-let regex = /[.]([\w-]+)/g;`
	`13`	`+let regex = /[\.\#]([\w-]+)/g;`
	`14`	`+let dot = vsc.CompletionItemKind.Class;`
	`15`	`+let hash = vsc.CompletionItemKind.Reference;`
`14`	`16`
`15`	`17`	`class Snippet {`
`16`	`18`
`@@ -129,7 +131,9 @@ class ClassServer implements vsc.CompletionItemProvider {`
`129`	`131`
`130`	`132`	`let ci: vsc.CompletionItem[] = [];`
`131`	`133`	`for (let item in items) {`
`132`		`- ci.push(items[item]);`
	`134`	`+ if (items[item].kind === dot) {`
	`135`	`+ ci.push(items[item]);`
	`136`	`+ }`
`133`	`137`	`}`
`134`	`138`	`return new vsc.CompletionList(ci);`
`135`	`139`	`}`
`@@ -150,6 +154,7 @@ function pushSymbols(key: string, symbols: lst.SymbolInformation[]): void {`
`150`	`154`	`let symbol;`
`151`	`155`	`while (symbol = regex.exec(symbols[i].name)) {`
`152`	`156`	`let item = new vsc.CompletionItem(symbol[1]);`
	`157`	`+ item.kind = symbol[0].startsWith('.') ? dot : hash;`
`153`	`158`	`ci.push(item);`
`154`	`159`	`}`
`155`	`160`	`}`