Skip to content
This repository was archived by the owner on Jun 2, 2023. It is now read-only.

With our powers combined #36

Merged
merged 43 commits into from
Mar 1, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
93b4c2a
Vendor powershell grammar from SublimeText
jrsconfitto Feb 3, 2015
3565888
Ignore node_modules directory
jrsconfitto Feb 3, 2015
2189efe
Add script to convert the vendored grammar to CSON
jrsconfitto Feb 3, 2015
b80a139
Update grammar
jrsconfitto Feb 3, 2015
f0d43a0
Adjust spec failure message
jrsconfitto Feb 3, 2015
4787d3a
Merge branch 'master' into with-our-powers-combined
jrsconfitto Feb 3, 2015
14a1624
Fix text of test helper method
jrsconfitto Feb 26, 2015
1608242
Fix escape character related tests
jrsconfitto Feb 26, 2015
60bac49
Fix comment-related tests
jrsconfitto Feb 26, 2015
0c0b4ad
Remove debug print
jrsconfitto Feb 26, 2015
35911f3
Fix variable test
jrsconfitto Feb 26, 2015
30a8177
Fix double-quoted strings tests
jrsconfitto Feb 26, 2015
6e4d4ce
Update keyword tests
jrsconfitto Feb 27, 2015
8eb8fcd
Fix some selection keyword tests
jrsconfitto Feb 27, 2015
ba82152
Fix do-until keyword tests
jrsconfitto Feb 27, 2015
20e583b
Remove debug statement
jrsconfitto Feb 27, 2015
ded473c
Fix `for`, `for-each` tests
jrsconfitto Feb 27, 2015
7522c48
Fix `try-catch-finally` tests
jrsconfitto Feb 27, 2015
6abd75c
Fix operator test
jrsconfitto Feb 27, 2015
34c06a5
Add unary operators test
jrsconfitto Feb 27, 2015
889a45e
Add describe statement back in
jrsconfitto Feb 27, 2015
975ee30
Move some operators from comparison to logical
jrsconfitto Feb 27, 2015
1d42c15
Adjust a comparison test
jrsconfitto Feb 27, 2015
590f1a7
Split automatics tests into variables and constants
jrsconfitto Feb 27, 2015
efa387f
Remove focus that snuck in there
jrsconfitto Feb 27, 2015
5c52fa8
Remove cmdlet tests
jrsconfitto Feb 27, 2015
6304f84
Update escaped characters test
jrsconfitto Feb 27, 2015
df99327
Update byte constants test
jrsconfitto Feb 27, 2015
8f5dfc5
Update float value tests
jrsconfitto Feb 27, 2015
071ca6c
Update hexadecimal test
jrsconfitto Feb 27, 2015
7db7c37
Add powershell scope to some tests
jrsconfitto Feb 27, 2015
6914d84
Remove a line continuation test
jrsconfitto Feb 27, 2015
1e54698
Refactor automatic variables list
jrsconfitto Mar 1, 2015
8959afb
Refactor and skip automatic variable tests
jrsconfitto Mar 1, 2015
4fe72ff
Add spec comment reference
jrsconfitto Mar 1, 2015
92c174a
Skip testing `--%` for now
jrsconfitto Mar 1, 2015
6691719
:lipstick: TODO
jrsconfitto Mar 1, 2015
820a362
Add TODO for `-shl`, `-sh` bitwise tests
jrsconfitto Mar 1, 2015
4a00db1
Temporarily skip shifts from bitwise tests
jrsconfitto Mar 1, 2015
d140017
Skip `sequence` and `workflow` tests temporarily
jrsconfitto Mar 1, 2015
0327057
Skip type tests for now, add TODO
jrsconfitto Mar 1, 2015
4b43c3d
Update licensing information
jrsconfitto Mar 1, 2015
ff506f0
Change readme language
jrsconfitto Mar 1, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "vendor/PowerShell"]
path = vendor/PowerShell
url = https://github.com/SublimeText/PowerShell.git
20 changes: 9 additions & 11 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
The MIT License (MIT)

Copyright (c) 2014 James R Sconfitto
Copyright (c) 2014-2015 James R Sconfitto

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand All @@ -10,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

---

Contains code from Atom's [language-csharp](https://github.com/atom/language-csharp) repository:
Contains code from Atom's [language-csharp](https://github.com/atom/language-csharp) repository released under the following license:

Copyright (c) 2014 GitHub Inc.

Expand All @@ -20,14 +18,14 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

This package was derived from a TextMate bundle located at https://github.com/wintermi/csharp-tmbundle by Matthew Winter @wintermi and Adam Lickel @lickel and distributed under the following license, located in README.markdown:
---

This bundle is dual-licensed under MIT and GPL licenses.
Utilizes grammar files and code from https://github.com/SublimeText/PowerShell, which is released under the following license:

http://www.opensource.org/licenses/mit-license.php
http://www.gnu.org/licenses/gpl.html
Use it, change it, fork it, sell it. Do what you will, but please leave the author attribution.
Copyright (c) 2011 Guillermo López-Anglada

---
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

This package was derived from [David Peckham's](https://github.com/davidpeckham) textmate [powershell bundle](https://github.com/davidpeckham/powershell.tmbundle).
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
[![Build Status](https://travis-ci.org/jugglingnutcase/language-powershell.svg?branch=master)](https://travis-ci.org/jugglingnutcase/language-powershell)
[![Build status](https://ci.appveyor.com/api/projects/status/ru4cfpi46m4bn5od/branch/master)](https://ci.appveyor.com/project/jugglingnutcase/language-powershell/branch/master)

This package highlights PowerShell syntax in the [Atom editor](https://atom.io).
This package provides PowerShell language support in the [Atom editor](https://atom.io).

## Language references

i just found this [helpful blog post](http://blogs.msdn.com/b/powershell/archive/2006/05/10/594535.aspx) on the
PowerShell grammar. i hope i *parse* :stuck_out_tongue_winking_eye: it well.

This was converted from [@davidpeckham]'s [PowerShell textmate bundle](https://github.com/davidpeckham/powershell.tmbundle). Thanks [@davidpeckham]!

[@davidpeckham]:https://github.com/davidpeckham
Loading