Merge pull request #9 from iq9891/master

v0.2.0

README.md

@@ -12,6 +12,13 @@
 <img src="https://static2.evente.cn/static/img/water.gif" alt="自动补全的示例" style="display: block; width: 288px;" />
 
 
+### 0.1.0 & 0.2.0
+
+> 2019-12-14
+
+- [feat] 新增版本和是否必填的指引。
+
+
 ### 0.0.4
 
 > 2019-12-13

build.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
 
 echo $1
-mkdir out
-cd out
-mkdir maps
-cp -r ../src/maps/** ./maps/
-cd ..
 
 tsc $1 -p ./

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-water-helper",
   "displayName": "vscode-water-helper",
   "description": "A vscode extension for WATER",
-  "version": "0.0.4",
+  "version": "0.2.0",
   "engines": {
     "vscode": "^1.40.0"
   },
@@ -71,7 +71,7 @@
   "scripts": {
     "vscode:prepublish": "yarn run compile",
     "compile": "sh build.sh",
-    "watch": "sh build.sh -watch",
+    "start": "sh build.sh -watch",
     "postinstall": "node ./node_modules/vscode/bin/install",
     "test": "node ./out/test/runTest.js",
     "lint": "prettier --write --parser typescript \"src/**/*.ts?(x)\""
@@ -87,7 +87,8 @@
     "tslint": "^5.20.0",
     "typescript": "^3.6.4",
     "vscode": "^1.1.36",
-    "vscode-test": "^1.2.2"
+    "vscode-test": "^1.2.2",
+    "water-helper-maps": "^0.1.0"
   },
   "dependencies": {
     "pretty": "^2.0.0",

src/app.ts

@@ -20,8 +20,10 @@ import {
   Range,
   EventEmitter,
 } from 'vscode';
-import * as TAGS from './maps/water-tags.json';
-import ATTRS from './maps/water-attributes.js';
+// import * as TAGS from './maps/water-tags.json';
+// import ATTRS from './maps/water-attributes.js';
+import * as TAGS from 'water-helper-maps/out/maps/water-tags.json';
+import ATTRS from 'water-helper-maps/out/maps/water-attributes.js';
 
 const PANEL_NAME = 'Water Vue';
 
@@ -325,16 +327,18 @@ export class WaterCompletionItemProvider implements CompletionItemProvider {
 
   buildAttrSuggestion(
     { attr, tag, bind, method },
-    { description, type, optionType, defaultValue }
+    { description, type, optionType, defaultValue, version, require }
   ) {
     if (
       (method && type === 'method') ||
       (bind && type !== 'method') ||
       (!method && !bind)
     ) {
       let documentation = description;
-      optionType && (documentation += '\n' + `type: ${optionType}`);
+      optionType && (documentation += '\n\n' + `type: ${optionType}`);
       defaultValue && (documentation += '\n' + `default: ${defaultValue}`);
+      require && (documentation += '\n' + `require: ${require}`);
+      version && (documentation += '\n' + `version: ${version}`);
       return {
         label: attr,
         insertText: