From 37e33495ab46c103d560429793a4164aeff80c0e Mon Sep 17 00:00:00 2001 From: Liangliang Zhu Date: Sat, 18 Mar 2023 11:10:15 +0800 Subject: [PATCH 1/2] preserve capitalization --- extension/main.js | 249 ++++++++++++++++++++++++---------------------- 1 file changed, 131 insertions(+), 118 deletions(-) diff --git a/extension/main.js b/extension/main.js index 6dd3d53..5e69e8a 100755 --- a/extension/main.js +++ b/extension/main.js @@ -2,7 +2,7 @@ let vscode = require('vscode'); const HINT_DATA_FILES = { - WORD: `${__dirname}/../hint_data/words.json` + WORD: `${__dirname}/../hint_data/words.json` }; const QUOTES = '\'\"'; @@ -12,148 +12,161 @@ const DOCUMENT_SELECTOR = ['markdown', 'latex']; const HOVER_INFO_WORD = '**Word**'; let wordCompletionItems = [], - wordItems = []; + wordItems = []; function getTextBeforeCursor(document, position) { - var start = new vscode.Position(position.line, 0); - var range = new vscode.Range(start, position); - return document.getText(range); + var start = new vscode.Position(position.line, 0); + var range = new vscode.Range(start, position); + return document.getText(range); } function getTextAroundCursor(document, position) { - let lineText = document.lineAt(position).text, - pos = position.character; - let beforeText = lineText.slice(0, pos), - afterText = lineText.slice(pos); - beforeText = (beforeText.match(/\w*$/) || [''])[0]; - afterText = (afterText.match(/^\w*/) || [''])[0]; - return beforeText + afterText; + let lineText = document.lineAt(position).text, + pos = position.character; + let beforeText = lineText.slice(0, pos), + afterText = lineText.slice(pos); + beforeText = (beforeText.match(/\w*$/) || [''])[0]; + afterText = (afterText.match(/^\w*/) || [''])[0]; + return beforeText + afterText; } function isCursorInTheString(textBeforeCursor) { - // TODO 考虑上一行行末是否有 \ 字符, 如果有的话就还要检测上一行 - if (textBeforeCursor.indexOf(QUOTES[0]) == -1 || - textBeforeCursor.indexOf(QUOTES[1]) == -1) return false; - - let len = textBeforeCursor.length, i = -1, inStr = false, char, qType; - while (++i < len) { - char = textBeforeCursor[i]; - if (char == '\\') - i++; - else if ((qType = QUOTES.indexOf(char)) >= 0) - inStr = inStr == QUOTES[qType] ? false : QUOTES[qType]; - } - return inStr; + // TODO 考虑上一行行末是否有 \ 字符, 如果有的话就还要检测上一行 + if (textBeforeCursor.indexOf(QUOTES[0]) == -1 || + textBeforeCursor.indexOf(QUOTES[1]) == -1) return false; + + let len = textBeforeCursor.length, i = -1, inStr = false, char, qType; + while (++i < len) { + char = textBeforeCursor[i]; + if (char == '\\') + i++; + else if ((qType = QUOTES.indexOf(char)) >= 0) + inStr = inStr == QUOTES[qType] ? false : QUOTES[qType]; + } + return inStr; } function getFuncAndParamsInfoAroundCursor(textBeforeCursor) { - if (textBeforeCursor.indexOf('(') == -1) return false; - return textBeforeCursor.match(/.+\b(\w+)\((.*?)$/); + if (textBeforeCursor.indexOf('(') == -1) return false; + return textBeforeCursor.match(/.+\b(\w+)\((.*?)$/); } function loadHintData() { - wordCompletionItems = []; - wordItems = require(HINT_DATA_FILES.WORD); - // window.alert(len(wordItems)); - // console.log(wordItems.length); - wordItems.forEach(word => { - let item = new vscode.CompletionItem(word.name, vscode.CompletionItemKind.Function); - item.documentation = word.desc; - item.detail = word.set; - item.usage = word.usage; - item._filter = word.name; - wordCompletionItems.push(item); - }); + wordCompletionItems = []; + wordItems = require(HINT_DATA_FILES.WORD); + // window.alert(len(wordItems)); + // console.log(wordItems.length); + wordItems.forEach(word => { + let item = new vscode.CompletionItem(word.name, vscode.CompletionItemKind.Function); + item.documentation = word.desc; + item.detail = word.set; + item.usage = word.usage; + item._filter = word.name; + wordCompletionItems.push(item); + }); } function searchHintCompletionItems(keyword) { - // console.log(keyword) - return wordCompletionItems.filter(it => it._filter.startsWith(keyword)); + // console.log(keyword) + return wordCompletionItems.filter(it => it._filter.startsWith(keyword)); } function findHintItem(wordname) { - let item = wordItems.filter(it => it.name == wordname); - // item.length || (item = varItems.filter(it => it.name == wordname)); - return item.length ? item[0] : null; + let item = wordItems.filter(it => it.name == wordname); + // item.length || (item = varItems.filter(it => it.name == wordname)); + return item.length ? item[0] : null; } function findHintFunctionItem(wordname) { - let item = wordItems.filter(it => it.name == wordname); - return item.length ? item[0] : null; + let item = wordItems.filter(it => it.name == wordname); + return item.length ? item[0] : null; } function activate(context) { - var subscriptions = context.subscriptions; - loadHintData(); - - subscriptions.push( - vscode.languages.registerCompletionItemProvider(DOCUMENT_SELECTOR, { - provideCompletionItems: (document, position/*, token*/) => { - let beforeText = getTextBeforeCursor(document, position); - // console.log(beforeText) - // beforeText = beforeText.toLowerCase() - if (isCursorInTheString(beforeText)) return []; - let keyword = (beforeText.match(/^.*?\b(\w*)$/) || ['', ''])[1]; - // console.log(keyword) - if (!keyword) return wordCompletionItems; - // keyword = beforeText; - let items = searchHintCompletionItems(keyword); - if (items.length == 0) // 大写开头的单词不能不全，转成小写搜索一遍 - items = searchHintCompletionItems(keyword.toLowerCase()); - return items; - }, - resolveCompletionItem: (item/*, token*/) => item - } - )); - - subscriptions.push( - vscode.languages.registerHoverProvider(DOCUMENT_SELECTOR, { - provideHover: (document, position/*, token*/) => { - let beforeText = getTextBeforeCursor(document, position); - if (isCursorInTheString(beforeText)) return []; - let textAround = getTextAroundCursor(document, position); - if (!textAround) return null; - let strlen = textAround.length; - let item = findHintItem(textAround); - if (!item) // 大写开头的查不到，可以变成小写再查一下 - item = findHintItem(textAround.toLowerCase()); - if (!item && textAround.charAt(strlen - 1) == "s")// 复数查不到，去掉s查一下 - item = findHintItem(textAround.substring(0, strlen - 1)); - if (!item && textAround.substring(strlen - 2, strlen) == "es")// 复数查不到，去掉es查一下 - item = findHintItem(textAround.substring(0, strlen - 2)); - if (!item && textAround.substring(strlen - 2, strlen) == "ed")// 过去式, end with ed - { - item = findHintItem(textAround.substring(0, strlen - 1)); // 过去式,has e, added d, - if (!item) { - item = findHintItem(textAround.substring(0, strlen - 2)); //过去式, end with ed - if (!item) - item = findHintItem(textAround.substring(0, strlen - 3)); //过去式, 辅音字母结尾的 - } - } - if (!item) return null; - return new vscode.Hover([ - `**${item.name}**`, `*${item.set}*`, item.desc - ]); - } - })); - - // subscriptions.push( - // vscode.languages.registerSignatureHelpProvider(DOCUMENT_SELECTOR, { - // provideSignatureHelp: (document, position/*, token*/) => { - // let beforeText = getTextBeforeCursor(document, position); - // if (isCursorInTheString(beforeText)) return null; - // //end of the function - // if (beforeText.match(/[);]$/)) return null; - // let info; - // if (!(info = getFuncAndParamsInfoAroundCursor(beforeText))) return null; - // let item = findHintFunctionItem(info[1])//info[1] === funcName; - // if (!item) return null; - // let res = new vscode.SignatureHelp(); - // res.activeSignature = 0; - // res.signatures = [new vscode.SignatureInformation(item.usage, item.desc)]; - // return res; - // } - // }, '(,')); + var subscriptions = context.subscriptions; + loadHintData(); + + subscriptions.push( + vscode.languages.registerCompletionItemProvider(DOCUMENT_SELECTOR, { + provideCompletionItems: (document, position/*, token*/) => { + let beforeText = getTextBeforeCursor(document, position); + // console.log(beforeText) + // beforeText = beforeText.toLowerCase() + if (isCursorInTheString(beforeText)) return []; + let keyword = (beforeText.match(/^.*?\b(\w*)$/) || ['', ''])[1]; + // console.log(keyword) + if (!keyword) return wordCompletionItems; + // keyword = beforeText; + let items = searchHintCompletionItems(keyword.toLowerCase()); + + if (keyword[0].toUpperCase() == keyword[0]) { + console.log(items.length) + if (items.length > 0) { + for (let i = 0; i < items.length; i++) { + // 获取元素的 label 属性 + let str = items[i].label; + // console.log(items[i]) + // 将首字母转换为大写 + str = str.replace(str[0], str[0].toUpperCase()); + // 更新数组中的元素 + items[i].label = str; + } + } + } + return items; + }, + resolveCompletionItem: (item/*, token*/) => item + } + )); + + subscriptions.push( + vscode.languages.registerHoverProvider(DOCUMENT_SELECTOR, { + provideHover: (document, position/*, token*/) => { + let beforeText = getTextBeforeCursor(document, position); + if (isCursorInTheString(beforeText)) return []; + let textAround = getTextAroundCursor(document, position); + if (!textAround) return null; + let strlen = textAround.length; + let item = findHintItem(textAround); + if (!item) // 大写开头的查不到，可以变成小写再查一下 + item = findHintItem(textAround.toLowerCase()); + if (!item && textAround.charAt(strlen - 1) == "s")// 复数查不到，去掉s查一下 + item = findHintItem(textAround.substring(0, strlen - 1)); + if (!item && textAround.substring(strlen - 2, strlen) == "es")// 复数查不到，去掉es查一下 + item = findHintItem(textAround.substring(0, strlen - 2)); + if (!item && textAround.substring(strlen - 2, strlen) == "ed")// 过去式, end with ed + { + item = findHintItem(textAround.substring(0, strlen - 1)); // 过去式,has e, added d, + if (!item) { + item = findHintItem(textAround.substring(0, strlen - 2)); //过去式, end with ed + if (!item) + item = findHintItem(textAround.substring(0, strlen - 3)); //过去式, 辅音字母结尾的 + } + } + if (!item) return null; + return new vscode.Hover([ + `**${item.name}**`, `*${item.set}*`, item.desc + ]); + } + })); + + // subscriptions.push( + // vscode.languages.registerSignatureHelpProvider(DOCUMENT_SELECTOR, { + // provideSignatureHelp: (document, position/*, token*/) => { + // let beforeText = getTextBeforeCursor(document, position); + // if (isCursorInTheString(beforeText)) return null; + // //end of the function + // if (beforeText.match(/[);]$/)) return null; + // let info; + // if (!(info = getFuncAndParamsInfoAroundCursor(beforeText))) return null; + // let item = findHintFunctionItem(info[1])//info[1] === funcName; + // if (!item) return null; + // let res = new vscode.SignatureHelp(); + // res.activeSignature = 0; + // res.signatures = [new vscode.SignatureInformation(item.usage, item.desc)]; + // return res; + // } + // }, '(,')); } @@ -162,4 +175,4 @@ function deactivate() { } exports.activate = activate; -exports.deactivate = deactivate; \ No newline at end of file +exports.deactivate = deactivate; From e0bd1c513cdb75369278e63a0e732f94f964bf77 Mon Sep 17 00:00:00 2001 From: Liangliang Zhu Date: Sat, 18 Mar 2023 11:11:24 +0800 Subject: [PATCH 2/2] remove console.log --- extension/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/extension/main.js b/extension/main.js index 5e69e8a..5322942 100755 --- a/extension/main.js +++ b/extension/main.js @@ -100,7 +100,6 @@ function activate(context) { let items = searchHintCompletionItems(keyword.toLowerCase()); if (keyword[0].toUpperCase() == keyword[0]) { - console.log(items.length) if (items.length > 0) { for (let i = 0; i < items.length; i++) { // 获取元素的 label 属性