Merge pull request #12 from jonsmithers/write-tests-and-clean-up-inde…

…ntation

Write tests and clean up indentation code

test/lit-html.vader → test/example-code-tests/example-code-tests.vader

@@ -1,3 +1,7 @@
+" This test file is not used for regular testing because the tests here are
+" generally very large in scope and thus not helpful in telling you what's
+" actually failing.
+
 Before:
   set tabstop=2
   set shiftwidth=2
@@ -285,3 +289,81 @@ Expect javascript:
 "       ${items.map((i) => html`<li>${i}</li>`)}
 "     </ul>
 "   `;
+
+
+Before:
+  set tabstop=2
+  set shiftwidth=2
+  set expandtab
+
+Given javascript (multiple syntaxes on one line);
+return html`<style>.mood { color: green; }</style>
+  Web Components are 
+  <span class="mood">${mood}</span>!`;
+
+Do:
+  =G
+
+Expect javascript;
+return html`<style>.mood { color: green; }</style>
+  Web Components are 
+  <span class="mood">${mood}</span>!`;
+
+Given javascript (tricky indnetation);
+return html`
+  <div> Files </div>
+  ${!this.fileList ? 
+      html`
+        <paper-button on-click=${() => this.onFetchBtn()}>
+          fetch notes
+        </paper-button>
+      ` : html`
+        <paper-button on-click=${() => this.onFetchBtn()}>
+          refresh
+        </paper-button>
+        ${repeat(this.fileList || [], null, (file) => html`
+          <paper-item on-click=${() => this.onFileClick(file.path)} data="${file}">${file.name}</paper-item>
+        `)}
+      `}
+    <style>
+      paper-fab#newFile {
+        position: fixed;
+        right: 20px;
+        bottom: 20px;
+      background-color: red;
+    }
+  </style>
+  <paper-fab icon="add" id="newFile" on-click=${()=>this.onNewFileClick()}></paper-fab>
+`;
+
+Do:
+  =G
+
+Expect javascript;
+return html`
+  <div> Files </div>
+  ${!this.fileList ? 
+      html`
+        <paper-button on-click=${() => this.onFetchBtn()}>
+          fetch notes
+        </paper-button>
+      ` : html`
+        <paper-button on-click=${() => this.onFetchBtn()}>
+          refresh
+        </paper-button>
+        ${repeat(this.fileList || [], null, (file) => html`
+          <paper-item on-click=${() => this.onFileClick(file.path)} data="${file}">${file.name}</paper-item>
+        `)}
+      `}
+    <style>
+      paper-fab#newFile {
+        position: fixed;
+        right: 20px;
+        bottom: 20px;
+      background-color: red;
+    }
+  </style>
+  <paper-fab icon="add" id="newFile" on-click=${()=>this.onNewFileClick()}></paper-fab>
+`;
+
+

test/indent/html-string-literal-end.vader

@@ -0,0 +1,149 @@
+Before:
+  set tabstop=2
+  set shiftwidth=2
+  set expandtab
+
+"                (IT SHOULD CORRECTLY INDENT...)
+Given javascript (LITERAL WITH SINGLE NEWLINE);
+{
+html`
+`;
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+  `;
+}
+
+Given javascript (LITERAL WITH SINGLE HTML TAG);
+{
+html`
+<div></div>
+`;
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    <div></div>
+  `;
+}
+
+
+Given javascript (LITERAL WITH SINGLE SELF CLOSING TAG);
+{
+html`
+<img />
+`;
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    <img />
+  `;
+}
+
+Given javascript (LITERAL AT END OF LINE, NO SEMICOLON);
+{
+html`
+<div>
+</div>`
+more()
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    <div>
+    </div>`
+  more()
+}
+
+Given javascript (LITERAL AT END OF LINE, WITH SEMICOLON);
+{
+html`
+<div>
+</div>`;
+more()
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    <div>
+    </div>`;
+  more()
+}
+
+Given javascript (LITERAL AT END OF ONLY LINE);
+{
+html`
+<div></div>`
+more()
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    <div></div>`
+  more()
+}
+
+Given javascript (NEXT LINE AFTER LITERAL);
+{
+html`
+${
+html`
+<div></div>` } `;
+more()
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    ${
+      html`
+        <div></div>` } `;
+  more()
+}
+
+After:
+# Given javascript (IGNORED: LITERAL AFTER SELF-CLOSING TAG)
+# {
+# html`
+# <div/>
+# `;
+# }
+#
+# Do:
+#   =G
+#
+# Expect javascript;
+# {
+#   html`
+#     <div/>
+#   `;
+# }

test/indent/html-string-literal-start.vader

@@ -0,0 +1,12 @@
+
+"                (IT SHOULD CORRECTLY INDENT...)
+Given javascript (COMMENTED TEMPLATES):
+  // html`
+  // <div></div>`;
+
+Do:
+  =G
+
+Expect javascript:
+  // html`
+  // <div></div>`;

test/indent/template-end.vader

@@ -0,0 +1,30 @@
+Before:
+  set tabstop=2
+  set shiftwidth=2
+  set expandtab
+
+"                (IT SHOULD CORRECTLY INDENT...)
+Given javascript (NEXT LINE OF HTML);
+{
+html`
+${
+html`${
+2 + 2}`}
+<div>
+</div>
+`;
+}
+
+Do:
+  =G
+
+Expect javascript;
+{
+  html`
+    ${
+      html`${
+        2 + 2}`}
+    <div>
+    </div>
+  `;
+}

test/minimalvimrc

@@ -5,4 +5,11 @@ call plug#begin('~/.vim/plugged')
     Plug 'pangloss/vim-javascript'
 call plug#end()
 syntax enable
+let g:VHTL_debugging = 1
 let g:html_indent_style1 = "inc"
+
+nmap <F10> :echo map(synstack(line("."), col(".")), "synIDattr(v:val, 'name')")<cr>
+
+set tabstop=2
+set shiftwidth=2
+set expandtab

test/runtests

@@ -2,4 +2,9 @@
 
 cd "$(dirname "$0")"
 
-vim -u <(cat minimalvimrc) +Vader*
+if [[ "$CI" = true ]]; then
+  export VADER_OUTPUT_FILE='testresults.txt'
+  vim -u <(cat minimalvimrc) +'Vader! indent/*.vader'
+else
+  vim -u <(cat minimalvimrc) +'Vader  indent/*.vader'
+fi