From 038fe3774cafbdaeda6b6877e1bff21deeb8619d Mon Sep 17 00:00:00 2001
From: Razvan Stoenescu <razvan.stoenescu@gmail.com>
Date: Thu, 9 Aug 2018 21:52:31 +0300
Subject: [PATCH 1/2] feat: Add support for Quasar Framework

---
 .../tagProviders/externalTagProviders.ts      | 18 +++++++++++++++
 .../src/modes/template/tagProviders/index.ts  | 23 +++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/server/src/modes/template/tagProviders/externalTagProviders.ts b/server/src/modes/template/tagProviders/externalTagProviders.ts
index 7caa7d6b7d..3dfc6e0725 100644
--- a/server/src/modes/template/tagProviders/externalTagProviders.ts
+++ b/server/src/modes/template/tagProviders/externalTagProviders.ts
@@ -1,3 +1,7 @@
+import * as ts from 'typescript';
+import * as fs from 'fs';
+import { join } from 'path';
+
 import { IHTMLTagProvider, Priority } from './common';
 
 import * as elementTags from 'element-helper-json/element-tags.json';
@@ -21,6 +25,20 @@ export const bootstrapTagProvider = getExternalTagProvider('bootstrap', bootstra
 export const buefyTagProvider = getExternalTagProvider('buefy', buefyTags, buefyAttributes);
 export const vuetifyTagProvider = getExternalTagProvider('vuetify', vuetifyTags, vuetifyAttributes);
 
+export function getQuasarTagProvider(workspacePath: string, pkg: any): IHTMLTagProvider | null {
+  const base = 'node_modules/quasar-framework';
+  const tagsPath = ts.findConfigFile(workspacePath, ts.sys.fileExists, join(base, pkg.vetur.tags));
+  const attrsPath = ts.findConfigFile(workspacePath, ts.sys.fileExists, join(base, pkg.vetur.attributes));
+
+  return tagsPath && attrsPath
+    ? getExternalTagProvider(
+      'quasar',
+      JSON.parse(fs.readFileSync(tagsPath, 'utf-8')),
+      JSON.parse(fs.readFileSync(attrsPath, 'utf-8'))
+    )
+    : null;
+}
+
 export function getExternalTagProvider(id: string, tags: any, attributes: any): IHTMLTagProvider {
   function findAttributeDetail(tag: string, attr: string) {
     return attributes[attr] || attributes[tag + '/' + attr];
diff --git a/server/src/modes/template/tagProviders/index.ts b/server/src/modes/template/tagProviders/index.ts
index 3144fa5045..6f3641a673 100644
--- a/server/src/modes/template/tagProviders/index.ts
+++ b/server/src/modes/template/tagProviders/index.ts
@@ -7,13 +7,15 @@ import {
   onsenTagProvider,
   bootstrapTagProvider,
   buefyTagProvider,
-  vuetifyTagProvider
+  vuetifyTagProvider,
+  getQuasarTagProvider
 } from './externalTagProviders';
 export { getComponentTags } from './componentTags';
 export { IHTMLTagProvider } from './common';
 
 import * as ts from 'typescript';
 import * as fs from 'fs';
+import { join } from 'path';
 
 export let allTagProviders: IHTMLTagProvider[] = [
   getHTML5TagProvider(),
@@ -39,7 +41,8 @@ export function getTagProviderSettings(workspacePath: string | null | undefined)
     onsen: false,
     bootstrap: false,
     buefy: false,
-    vuetify: false
+    vuetify: false,
+    quasar: false
   };
   if (!workspacePath) {
     return settings;
@@ -68,6 +71,22 @@ export function getTagProviderSettings(workspacePath: string | null | undefined)
     if (packageJson.dependencies['vuetify']) {
       settings['vuetify'] = true;
     }
+
+    const quasarPath = ts.findConfigFile(
+      workspacePath,
+      ts.sys.fileExists,
+      join('node_modules', 'quasar-framework', 'package.json')
+    );
+    if (quasarPath) {
+      const quasarPkg = JSON.parse(fs.readFileSync(quasarPath, 'utf-8'));
+      if (quasarPkg.vetur) {
+        const provider = getQuasarTagProvider(workspacePath, quasarPkg);
+        if (provider !== null) {
+          allTagProviders.push(provider);
+          settings['quasar'] = true;
+        }
+      }
+    }
   } catch (e) {}
   return settings;
 }

From 704a63e1844e2d8122443605f9c300c633d7f851 Mon Sep 17 00:00:00 2001
From: Razvan Stoenescu <razvan.stoenescu@gmail.com>
Date: Thu, 9 Aug 2018 23:06:59 +0300
Subject: [PATCH 2/2] chore: Add Quasar unit-tests

---
 test/fixture/client/completion/template/Quasar.vue |  4 ++++
 test/fixture/package.json                          |  1 +
 test/fixture/yarn.lock                             |  4 ++++
 test/lsp/completion/template.test.ts               | 12 +++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/fixture/client/completion/template/Quasar.vue

diff --git a/test/fixture/client/completion/template/Quasar.vue b/test/fixture/client/completion/template/Quasar.vue
new file mode 100644
index 0000000000..c95712bc42
--- /dev/null
+++ b/test/fixture/client/completion/template/Quasar.vue
@@ -0,0 +1,4 @@
+<template>
+  <q-btn :></q-btn>
+  <q-
+</template>
diff --git a/test/fixture/package.json b/test/fixture/package.json
index 48ae4aff0a..5125d860c7 100644
--- a/test/fixture/package.json
+++ b/test/fixture/package.json
@@ -40,6 +40,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "element-ui": "^2.4.5",
+    "quasar-framework": "^0.17.8",
     "lodash": "^4.17.4",
     "promise-polyfill": "^6.0.2",
     "vue": "^2.5.3",
diff --git a/test/fixture/yarn.lock b/test/fixture/yarn.lock
index 07eabea784..8fe54497da 100644
--- a/test/fixture/yarn.lock
+++ b/test/fixture/yarn.lock
@@ -4653,6 +4653,10 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+quasar-framework@^0.17.8:
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/quasar-framework/-/quasar-framework-0.17.8.tgz#61cc2be67f48a7cd1f7d95885ead44a4337b7b44"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
diff --git a/test/lsp/completion/template.test.ts b/test/lsp/completion/template.test.ts
index 5507a9c112..8164640b50 100644
--- a/test/lsp/completion/template.test.ts
+++ b/test/lsp/completion/template.test.ts
@@ -5,6 +5,7 @@ import { testCompletion } from './helper';
 describe('Should autocomplete for <template>', () => {
   const templateDocUri = getDocUri('client/completion/template/Basic.vue');
   const templateFrameworkDocUri = getDocUri('client/completion/template/Framework.vue');
+  const templateQuasarDocUri = getDocUri('client/completion/template/Quasar.vue');
 
   before('activate', async () => {
     await activateLS();
@@ -35,6 +36,15 @@ describe('Should autocomplete for <template>', () => {
     it('completes attributes for <el-button>', async () => {
       await testCompletion(templateFrameworkDocUri, position(1, 14), ['size', 'type', 'plain']);
     });
+  });
+
+  describe('Should complete Quasar components', () => {
+    it('completes <q-btn>', async () => {
+      await testCompletion(templateQuasarDocUri, position(2, 5), ['q-btn']);
+    });
 
+    it('completes attributes for <q-btn>', async () => {
+      await testCompletion(templateQuasarDocUri, position(1, 10), ['label', 'icon']);
+    });
   });
-});
\ No newline at end of file
+});