v0.0.6

benc-uk · Sep 23, 2019 · 6f5fc8d · 6f5fc8d
1 parent 675057a
commit 6f5fc8d
Show file tree

Hide file tree

Showing 10 changed files with 869 additions and 7 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -2,4 +2,5 @@ src/**
 .vscode/**
 .gitignore
 tsconfig.json
-tslint.json
+tslint.json
+testfiles/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.6
+- Fix for SKU evaluation error (exp.trim)
+- Nicer error messages
+
 ## 0.0.5
 - Snap to grid added
 - Telemetry tracking added

diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ This extension displays a graphical preview of Azure Resource Manager (ARM) temp
 # Usage
 - Open a ARM template JSON file, and ensure it is active/focused
   - Click the eye symbol in the top right of the editor tab bar
+  - ![toolbar](assets/readme/icon.png)
 - Or:
   - Open the VS Code command pallet with `Ctrl+Shift+P` or `⇧⌘P` on a mac
   - Start typing `ARM Viewer`

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -8,9 +8,29 @@ body{
 }
 
 #error {
+  display: none;
+  font-size: 120%;
+  margin: 0 auto;
+  margin-top: 50%;
+  border: 2px solid var(--vscode-button-background);
+  box-shadow: 0 0 35px rgba(0, 0, 0, 0.7);
+}
+
+#errortitle {
+  background-color: var(--vscode-selection-background);
+  font-weight: bold;
+  font-size: 150%;
+  padding: 8px;
+}
+
+#errormsg {
   font-size: 120%;
   color: var(--vscode-errorForeground);
   font-family: var(--vscode-editor-font-family);
+  white-space: pre-wrap;
+  word-break: break-all;
+  word-wrap: break-word;
+  padding: 10px;
 }
 
 button {

diff --git a/assets/readme/icon.png b/assets/readme/icon.png
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "armview",
 	"displayName": "ARM Template Viewer",
 	"description": "Graphically display ARM templates in an interactive map view",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"icon": "assets/img/icons/main.png",
 	"publisher": "bencoleman",
 	"author": {

diff --git a/src/extension.ts b/src/extension.ts
@@ -174,8 +174,8 @@ function refreshView() {
 // Initialise the contents of the webview - called at startup
 //
 function getWebviewContent() {	
-	let wsname = "undefined";
-	if(vscode.workspace.name) wsname = vscode.workspace.name;
+	// Send telemetry for activation 
+	let wsname: string = vscode.workspace.name || "unknown";
 	reporter.sendTelemetryEvent('activated', {'workspace': wsname});
 
 	if(!panel)
@@ -208,7 +208,12 @@ function getWebviewContent() {
 	<title>ARM Viewer</title>
 </head>
 <body>
-	<div id="error"></div>
+	<div id="error">
+		<div id="errortitle">⚠️ Parser Error</div>
+		<div id="errormsg">
+		</div>
+	</div>
+
 	<div id="buttons">
 		<button onclick="toggleLabels()">LABELS</button>
 		<button onclick="cy.fit()">FIT</button>
@@ -226,6 +231,7 @@ function getWebviewContent() {
 	</div>
 	
 	<script>	
+		// Message handler in webview, messages are sent by extension
 		window.addEventListener('message', event => {
 			const message = event.data;
 
@@ -237,7 +243,7 @@ function getWebviewContent() {
 			}
 
 			if(message.command == 'error') {
-				document.getElementById('error').innerHTML = message.payload
+				document.getElementById('errormsg').innerHTML = message.payload
 				document.getElementById('error').style.display = "block"
 				document.getElementById('mainview').style.display = "none"
 				document.getElementById('buttons').style.display = "none"

diff --git a/src/lib/arm-parser.ts b/src/lib/arm-parser.ts
@@ -8,6 +8,7 @@
 import * as utils from './utils'
 import * as path from 'path';
 import TelemetryReporter from 'vscode-extension-telemetry';
+import { ESPIPE } from 'constants';
 const jsonlint = require('jsonlint');
 
 class ARMParser {
@@ -43,7 +44,7 @@ class ARMParser {
 
     // Some simple ARM validation
     if(!this.template.resources || !this.template.$schema) {
-      this.error = `That's valid JSON, but I don't think that's a valid ARM template`;
+      this.error = `File doesn't appear to be an ARM template, but is valid JSON`;
       return;      
     }
 
@@ -298,6 +299,10 @@ class ARMParser {
   // Main ARM expression parser, attempts to evaluate and resolve ARM expressions into strings
   //
   private _evalExpression(exp: string): any {
+    // Catch some rare errors where non-strings are parsed
+    if(typeof exp != "string")
+      return exp;
+
     exp = exp.trim();
 
     // catch special cases, with referenced properties, e.g. resourceGroup().location