From b3147b02a2555629f24ddaaac50817455c342ade Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Fri, 9 Nov 2018 00:12:49 +0800
Subject: [PATCH 1/2] test: add tests

---
 tests/html_angular/__snapshots__/jsfmt.spec.js.snap | 9 +++++++++
 tests/html_angular/attributes.component.html        | 1 +
 2 files changed, 10 insertions(+)

diff --git a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
index 40ea17733b06..62af05b13fe5 100644
--- a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
@@ -85,6 +85,7 @@ exports[`attributes.component.html - angular-verify 1`] = `
     {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS,
       'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
       'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}"
+    [stickout]="+toolAssembly.stickoutMm"
 ></div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <div
@@ -194,6 +195,7 @@ exports[`attributes.component.html - angular-verify 1`] = `
     'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
     'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER
   }"
+  [stickout]="toolAssembly.stickoutMm - "
 ></div>
 
 `;
@@ -283,6 +285,7 @@ exports[`attributes.component.html - angular-verify 2`] = `
     {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS,
       'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
       'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}"
+    [stickout]="+toolAssembly.stickoutMm"
 ></div>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <div
@@ -392,6 +395,7 @@ exports[`attributes.component.html - angular-verify 2`] = `
     'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
     'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER
   }"
+  [stickout]="toolAssembly.stickoutMm - "
 ></div>
 
 `;
@@ -481,6 +485,7 @@ exports[`attributes.component.html - angular-verify 3`] = `
     {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS,
       'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
       'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}"
+    [stickout]="+toolAssembly.stickoutMm"
 ></div>
 ~
 <div
@@ -812,6 +817,10 @@ exports[`attributes.component.html - angular-verify 3`] = `
         .level ===
       dialogLevelEnum.DANGER
   }"
+  [stickout]="
+    toolAssembly.stickoutMm -
+
+  "
 ></div>
 
 `;
diff --git a/tests/html_angular/attributes.component.html b/tests/html_angular/attributes.component.html
index a33b7c3003da..71ec64da990a 100644
--- a/tests/html_angular/attributes.component.html
+++ b/tests/html_angular/attributes.component.html
@@ -82,4 +82,5 @@
     {'btn-success': (dialog$ | async).level === dialogLevelEnum.SUCCESS,
       'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
       'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER}"
+    [stickout]="+toolAssembly.stickoutMm"
 ></div>

From 150f44559305722e5efc9121129e9fe83b6aa6da Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Fri, 9 Nov 2018 00:13:32 +0800
Subject: [PATCH 2/2] fix(angular): correctly print unary expression with `+`

---
 package.json                                        | 2 +-
 tests/html_angular/__snapshots__/jsfmt.spec.js.snap | 7 +++----
 yarn.lock                                           | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 034e08f8f6bf..2fa025db88cf 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.1.5",
     "@glimmer/syntax": "0.30.3",
     "@iarna/toml": "2.0.0",
-    "angular-estree-parser": "1.1.4",
+    "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.0.0",
     "camelcase": "4.1.0",
     "chalk": "2.1.0",
diff --git a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
index 62af05b13fe5..c5f38f8361c4 100644
--- a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
@@ -195,7 +195,7 @@ exports[`attributes.component.html - angular-verify 1`] = `
     'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
     'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER
   }"
-  [stickout]="toolAssembly.stickoutMm - "
+  [stickout]="+toolAssembly.stickoutMm"
 ></div>
 
 `;
@@ -395,7 +395,7 @@ exports[`attributes.component.html - angular-verify 2`] = `
     'btn-warning': (dialog$ | async).level === dialogLevelEnum.WARNING,
     'btn-svg': (dialog$ | async).level === dialogLevelEnum.DANGER
   }"
-  [stickout]="toolAssembly.stickoutMm - "
+  [stickout]="+toolAssembly.stickoutMm"
 ></div>
 
 `;
@@ -818,8 +818,7 @@ exports[`attributes.component.html - angular-verify 3`] = `
       dialogLevelEnum.DANGER
   }"
   [stickout]="
-    toolAssembly.stickoutMm -
-
+    +toolAssembly.stickoutMm
   "
 ></div>
 
diff --git a/yarn.lock b/yarn.lock
index 5f5099aff67a..43af90ad8c83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -704,9 +704,9 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-angular-estree-parser@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-1.1.4.tgz#173fd2a9a30ccd38864e879e66b83cbbbdfd45db"
+angular-estree-parser@1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-1.1.5.tgz#f278e03e648a2bfb6c5dcdf17ba3273f3251b74a"
   dependencies:
     lines-and-columns "^1.1.6"
     tslib "^1.9.3"