Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Fixed end of attributes regexp #27

Merged
merged 1 commit into from
Apr 24, 2015
Merged

Conversation

iRet
Copy link
Contributor

@iRet iRet commented Mar 4, 2015

This fix will turn
image

To this
image

@iRet
Copy link
Contributor Author

iRet commented Mar 4, 2015

Don't merge, second commit not works as expected and requrie polishing,
However first solves problem for tag attributes.

@cannikin
Copy link
Collaborator

Looking good now?

@iRet
Copy link
Contributor Author

iRet commented Mar 17, 2015

@cannikin unfotunately no
Attributes and ruby line was fixed in multiline, but tags higlight was broken in some cases where tags not spaces by empty line. Need a fresh look.

@igor10k
Copy link

igor10k commented Apr 23, 2015

@iRet Just wanted to contribute the same thing. Seems like changing end for meta.section.attributes.haml to \\}(?!\\s*,) is enough. Why did you bother with source.ruby.embedded.haml?

@iRet
Copy link
Contributor Author

iRet commented Apr 24, 2015

@igor10k Hi.
That's enough for attributes hash, but not for ruby code line.

@igor10k
Copy link

igor10k commented Apr 24, 2015

@iRet I thought this issue is only about attributes hash. Let's merge the attributes fix and create another issue for the ruby code line with some screenshots and a description of the problem as I don't understand what's wrong with it?

@iRet
Copy link
Contributor Author

iRet commented Apr 24, 2015

@igor10k a good idea, I will remove unrelated lines from PR.
As for rubycode problems, please check #20

@igor10k
Copy link

igor10k commented Apr 24, 2015

@iRet You should squash those 5 commits into one.

@cannikin
Copy link
Collaborator

Howdy! What's going on here, should I merge this?

@igor10k
Copy link

igor10k commented Apr 24, 2015

@cannikin currently it's 5 commits for one changed line. I'd wait till he squashes the commits first.

@iRet
Copy link
Contributor Author

iRet commented Apr 24, 2015

@igor10k thanks, now I know how to do squash :)

@igor10k
Copy link

igor10k commented Apr 24, 2015

@iRet great 😄

@cannikin looks like it's time to merge now

@cannikin
Copy link
Collaborator

LET'S DO IT

cannikin added a commit that referenced this pull request Apr 24, 2015
Fixed end of attributes regexp
@cannikin cannikin merged commit 9a46ac1 into HarlemSquirrel:master Apr 24, 2015
@cannikin
Copy link
Collaborator

Released v0.20.0

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants