Indent code in Go HTML templates

[jinzhu]

Before when write go code in templates, it is not indented correctly, for example:

{{if true}}
hello world
{{end}}

I think this should be indented to:

{{if true}}
  hello world
{{end}}

This pull request did the job, fixed the indention for if/else, range, with, block, define

[fatih]

Thanks @jinzhu for your contribution. @cespare do you mind have a look at it ? I'm not using templates recently. It looks good otherwise :)

[jinzhu]

I have made a test template to try to cover all cases, hope it could be helpful.

<div class="qor-page__body">
  {{render "hello1"}}
  {{render "hello2"}}

  {{if true}}
    <p>
      hello world
      {{if hello}}
        hello world
      {{else}}
        hello world
      {{end}}
    </p>
  {{else}}
  {{end}}

  {{render "hello3"}}
</div>

[cespare]

I can take a look in the next few days.
On Feb 4, 2016 2:00 AM, "Fatih Arslan" [email protected] wrote:

Thanks @jinzhu https://github.com/jinzhu for your contribution. @cespare
https://github.com/cespare do you mind have a look at it ? I'm not
using templates recently.

—
Reply to this email directly or view it on GitHub
#709 (comment).

[fatih]

Thanks @cespare 👍

[cespare]

This change doesn't work for me at all, because the HtmlIndent function is not defined.

[fatih]

@jinzhu any comments on that ?

[jinzhu]

Hi @cespare

This method is defined in vim, file indent/html.vim, which is required from here https://github.com/fatih/vim-go/blob/master/indent/gohtmltmpl.vim#L5

[jinzhu]

From vim's source code. https://github.com/vim/vim/blob/089af18d1fd0961ff504ee72db0156bbfe509cdf/runtime/indent/html.vim#L947

cc @fatih

[fatih]

Maybe we should add a clause to check if this exists or not by checking the version and patch level. An example how to do it: http://vi.stackexchange.com/a/2467/2791

[cespare]

BTW I'm using a fairly recent vim (7.4 something, can't check the exact version at the moment).

I suspect that calling this function is the wrong approach in general. When I look at indent files for other templating languages, they don't do it this way. Example: https://github.com/mitsuhiko/vim-jinja/blob/master/indent/htmljinja.vim

[jinzhu]

I just pushed another commit, fixed it doesn't work on vim 7.3, I have tested new fix with below three versions, all works for me. @cespare could you test it works for you or not?

VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Feb 10 2016 14:45:20)
MacOS X (unix) version
Included patches: 1-1257

NVIM v0.1.1-145-g074d3dc (compiled Jan  6 2016 09:09:15)
Build type: Dev

VIM - Vi IMproved 7.3 (2010 Aug 15, compiled Oct 27 2015 16:22:14)
Compiled by [email protected]
Normal version without GUI.  Features included (+) or not (-):

I think vim-jinja is just using another solution to make things works, from github search results count, it is less used that current solution. I haven't found much documents about this when writing the code, so just pick up a simper solution. ;)

[cespare]

Works for me.

LGTM.

[fatih]

let ind += sw

[fatih]

@jinzhu this looks good. Can you squash it into one commit if possible?

[jinzhu]

@fatih sure, just did this ;)

[fatih]

Thanks @jinzhu for the contribution 👍