Skip to content

Conversation

william-voyek
Copy link

Resubmitting pull-request. Corrected line-ending issues.

@@ -134,7 +134,7 @@
</dict>
<dict>
<key>begin</key>
<string>@"$</string>
<string>^@"\n</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would not work here:

$someVar = @"
hello
"@

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think a lookahead would be preferable:

@"(?=\n)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that it works properly. With my change:
__desktop_serversetup_ps1 2

Without change:
__desktop_serversetup_ps1

Also using the lookahead gives the same result as the unmodified syntax file.

@guillermooo
Copy link
Member

Thanks, for the PR. I've left a couple of comments.

@@ -205,9 +205,9 @@
</dict>
<dict>
<key>begin</key>
<string>@'$</string>
<string>@'\n</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I forgot to mention to do the same as above. Let's add a lookahead here too for consistency.

@guillermooo
Copy link
Member

Not 100% compliant with PS syntax, but as it fixes an error, I'll merge this. Thanks @william-voyek !

guillermooo added a commit that referenced this pull request Oct 7, 2014
fixed here-string formating
@guillermooo guillermooo merged commit 91a4845 into SublimeText:master Oct 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants