volar-service-html 0.0.14 → 0.0.16

package/out/index.js

@@ -1,31 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = exports.getHtmlDocument = void 0;
-const html = __importStar(require("vscode-html-languageservice"));
-const path = __importStar(require("path"));
+const html = require("vscode-html-languageservice");
 const vscode_uri_1 = require("vscode-uri");
 const parserLs = html.getLanguageService();
 const htmlDocuments = new WeakMap();
@@ -132,12 +108,7 @@ function create({ languageId = 'html', useDefaultDataProvider = true, useCustomD
             },
             provideDocumentSymbols(document) {
                 return worker(document, (htmlDocument) => {
-                    // TODO: wait for https://github.com/microsoft/vscode-html-languageservice/pull/152
-                    const symbols = [];
-                    htmlDocument.roots.forEach(node => {
-                        provideFileSymbolsInternal(document, node, symbols);
-                    });
-                    return symbols;
+                    return htmlLs.findDocumentSymbols2(document, htmlDocument);
                 });
             },
             provideFoldingRanges(document) {
@@ -275,6 +246,8 @@ function create({ languageId = 'html', useDefaultDataProvider = true, useCustomD
             const newData = [];
             for (const customDataPath of customData) {
                 try {
+                    const pathModuleName = 'path'; // avoid bundle
+                    const { posix: path } = require(pathModuleName);
                     const jsonPath = path.resolve(customDataPath);
                     newData.push(html.newHTMLDataProvider(customDataPath, require(jsonPath)));
                 }
@@ -305,36 +278,4 @@ const NL = '\n'.charCodeAt(0);
 function isNewlineCharacter(charCode) {
     return charCode === CR || charCode === NL;
 }
-function provideFileSymbolsInternal(document, node, symbols) {
-    const name = nodeToName(node);
-    const range = {
-        start: document.positionAt(node.start),
-        end: document.positionAt(node.end),
-    };
-    const symbol = {
-        name,
-        kind: 8,
-        range,
-        selectionRange: range,
-    };
-    symbols.push(symbol);
-    node.children.forEach(child => {
-        symbol.children ??= [];
-        provideFileSymbolsInternal(document, child, symbol.children);
-    });
-}
-function nodeToName(node) {
-    let name = node.tag;
-    if (node.attributes) {
-        const id = node.attributes['id'];
-        const classes = node.attributes['class'];
-        if (id) {
-            name += `#${id.replace(/[\"\']/g, '')}`;
-        }
-        if (classes) {
-            name += classes.replace(/[\"\']/g, '').split(/\s+/).map(className => `.${className}`).join('');
-        }
-    }
-    return name || '?';
-}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.14",
+	"version": "0.0.16",
 	"description": "Integrate vscode-languageservice-html into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/html",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -29,6 +29,7 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
+		"@types/node": "latest",
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"peerDependencies": {
@@ -39,5 +40,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "6fb81d23ead08b2fdb0812b272216ced8497aed0"
+	"gitHead": "fdcd47eb5dc865999ac7ac610f8e0dfb458aca04"
 }