fix #20

hchiam · Aug 4, 2019 · 71f1dc5 · 71f1dc5
1 parent b4ec120
commit 71f1dc5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the "custom-vscode-linter" extension will be documented in this file.
 
+## 0.7.1
+
+- Fixed #20 faulty check for password for SQL.
+
 ## 0.7.0
 
 - Added check for `TODO` comments.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "custom-vscode-linter",
   "displayName": "custom-vscode-linter",
   "description": "Custom VSCode Linter!",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "publisher": "hchiam",
   "repository": {
     "type": "git",

diff --git a/src/extension.ts b/src/extension.ts
@@ -97,7 +97,9 @@ export function activate(context: vscode.ExtensionContext) {
 	}
 
 	function check_encryptedSQL(rangesToDecorate: vscode.DecorationOptions[]) {
-		let regex = /AS[\r\n\s]+BEGIN/g;
+		// cover "AS BEGIN"
+		// cover "AS--WITH ENCRYPTION BEGIN" but missing "--comment: sp_password" after it
+		let regex = /(AS(?!--WITH ENCRYPTION)[\r\n\s]+BEGIN[\r\n\s]*|AS *--WITH ENCRYPTION[\r\n\s]+BEGIN(?![\r\n\s]*--comment: sp_password))/g;
 		let hoverMessage = 'AS BEGIN should have "AS--WITH ENCRYPTION" and "BEGIN  -- comment: sp_password"';
 		let popupMessage = 'AS BEGIN should have "AS--WITH ENCRYPTION" and "BEGIN  -- comment: sp_password"';
 		genericCheck(regex, hoverMessage, popupMessage, rangesToDecorate);

diff --git a/visually-check-this.js b/visually-check-this.js
@@ -81,6 +81,10 @@ AS--WITH ENCRYPTION
 BEGIN
 --comment: sp_password // NO
 
+AS--WITH ENCRYPTION
+BEGIN
+ // YES
+
 Number(someOkThing); // NO
 Number(someID); // YES
 Number(something.someId); // YES