From ef37f99508c5b133c7ec98b8fe2a95b9bdc51021 Mon Sep 17 00:00:00 2001 From: Scott Motte Date: Thu, 15 Jun 2023 14:14:49 -0700 Subject: [PATCH 1/2] Do not permit secretpeeking during autocompletion (when turned off) --- CHANGELOG.md | 12 +++++++++--- lib/helpers.js | 31 +++++++++++++++++++------------ package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23576ff..eb87ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,21 @@ All notable changes to the Official Dotenv VS Code extension will be documented in this file. -## [Unreleased](https://github.com/dotenv-org/dotenv-vscode/compare/v0.24.3...master) +## [Unreleased](https://github.com/dotenv-org/dotenv-vscode/compare/v0.27.2...master) -## 0.27.1 +## [0.27.2](https://github.com/dotenv-org/dotenv-vscode/compare/v0.27.2...v0.27.1) (2023-06-15) + +### Added + +* For autocompletion, respect secret peeking setting off or on + +## [0.27.1](https://github.com/dotenv-org/dotenv-vscode/compare/v0.27.1...v0.27.0) (2023-06-15) ### Changed * `await` for async function to set `files.associations` in extension.js -## 0.27.0 +## [0.27.0](https://github.com/dotenv-org/dotenv-vscode/compare/v0.27.0...v0.26.0) (2023-06-15) ### Added diff --git a/lib/helpers.js b/lib/helpers.js index 37466fc..5de7328 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -81,33 +81,40 @@ function autocomplete (triggerCharacter, document, position) { return entries.map(function (env) { const key = env[0].trim() const value = env[1].trim() + let formattedValue = settings.missingText() + + if (value) { + if (settings.secretpeekingEnabled()) { + formattedValue = value + } else { + formattedValue = _partialMask(value) + } + } // https://code.visualstudio.com/api/references/vscode-api#CompletionItemLabel const completionItemLabel = { label: key, - detail: ` ${value}` + // detail: ` ${value}` + detail: ` ${formattedValue}` } const item = new vscode.CompletionItem(completionItemLabel, vscode.CompletionItemKind.Variable) item.insertText = `${triggerCharacter}${quote}${key}${quote}` item.filterText = `${triggerCharacter}${quote}${key}${quote}` item.range = new vscode.Range(new vscode.Position(position.line, position.character - 1), position) // Picks up trigger character as prefix to fix the scoring it does when sorting item.sortText = '0' // Make this the sortText so that any ENV variables will go to the top of the list above anything else - if (!value) { - // do nothing - } else { - const s = `.env + + const s = `.env
**${key}** -
${value}
+
${formattedValue}
` - const doc = new vscode.MarkdownString(s) - doc.value = s - doc.supportHtml = true - // item.documentation = value // update with more details - item.documentation = doc // more details - } + const doc = new vscode.MarkdownString(s) + doc.value = s + doc.supportHtml = true + // item.documentation = value // update with more details + item.documentation = doc // more details return item }) diff --git a/package-lock.json b/package-lock.json index 03b8979..e4fb92c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dotenv-vscode", - "version": "0.27.1", + "version": "0.27.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dotenv-vscode", - "version": "0.27.1", + "version": "0.27.2", "license": "MIT", "dependencies": { "dotenv": "^16.0.2" diff --git a/package.json b/package.json index 92bd9a0..99ea5bf 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Dotenv Official +Vault", "description": "Official Dotenv. Syntax highlighting, auto-cloaking, auto-completion, in-code secret peeking, and optionally dotenv-vault.", "author": "Mot @motdotla", - "version": "0.27.1", + "version": "0.27.2", "license": "MIT", "homepage": "https://github.com/dotenv-org/dotenv-vscode", "icon": "dotenv.png", From 12fa55e29ee5c815b0241c0cfc0792a53e81cf8a Mon Sep 17 00:00:00 2001 From: Scott Motte Date: Thu, 15 Jun 2023 14:15:26 -0700 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb87ff7..ed39a41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to the Official Dotenv VS Code extension will be documented ### Added -* For autocompletion, respect secret peeking setting off or on +* For autocompletion, respect secret peeking setting off or on [#97](https://github.com/dotenv-org/dotenv-vscode/pull/97) ## [0.27.1](https://github.com/dotenv-org/dotenv-vscode/compare/v0.27.1...v0.27.0) (2023-06-15)