fix #21

hchiam · Aug 7, 2019 · 02900fe · 02900fe
1 parent 3a34192
commit 02900fe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
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.1",
+  "version": "0.7.2",
   "publisher": "hchiam",
   "repository": {
     "type": "git",

diff --git a/src/extension.ts b/src/extension.ts
@@ -99,7 +99,7 @@ export function activate(context: vscode.ExtensionContext) {
 	function check_encryptedSQL(rangesToDecorate: vscode.DecorationOptions[]) {
 		// 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 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
@@ -85,6 +85,13 @@ AS--WITH ENCRYPTION
 BEGIN
  // YES
 
+// NO:
+AS--WITH ENCRYPTION
+
+BEGIN
+
+  -- comment: sp_password
+
 Number(someOkThing); // NO
 Number(someID); // YES
 Number(something.someId); // YES