Skip to content

Commit 2771d0c

Browse files
guillermoooguillermooo
committed
fixed conflict
2 parents 0d9478d + 070c7d6 commit 2771d0c

24 files changed

+442
-343
lines changed

‎CONTRIBUTING.md‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,47 @@
1-
Contributing
2-
============
1+
## Contributing
32

4-
There are two permanent brances: **master** and **dev**.
5-
**Master** always points to the latest release tag.
6-
All development is done in **dev** branch,
7-
please, use it for pull requests.
3+
Thanks for taking an insterest in contributing to the PowerShell package for
4+
Sublime Text 3!
85

9-
If you are fixing grammar (syntax highlighting), please, add affected samples to [test-file.ps1](/tests/samples/test-file.ps1).
10-
We use it in automated tests that compare grammar against PowerShell tokenizer.
11-
It also serves as a place for humans to stare to all exotic language constructions.
6+
7+
### Development
8+
9+
Development happens on the **dev** branch. Please send your PRs against that
10+
branch only.
11+
12+
13+
### Building Development Versions
14+
15+
To build development versions, first you need a configuration file in
16+
`$env:USERPROFILE\sublime-package-dev.json`.
17+
18+
This file must contain the following information:
19+
20+
{
21+
"pathToSublimeText": "...\sublime_text.exe",
22+
"pathToSublimeTextData": "...\
23+
}
24+
25+
26+
#### Using Sublime Text
27+
28+
1. Press <kbd>Ctrl+Shift+B</kbd> to open the build systems menu.
29+
2. Select 'PowerShell: Build Dev Version'
30+
31+
32+
#### Using the Command Line
33+
34+
From the project's root:
35+
36+
.\bin\BuildFolder.ps1 -verbose
37+
38+
39+
#### Running Tests
40+
41+
If you are adding functionality or making substantial changes to existing
42+
code, please add tests and ensure that existing tests pass.
43+
44+
Currently, we have very few tests and they aren't easy to run... :-(
45+
46+
If you feel lazy about writing tests, this is the right time to contribute --
47+
we'll turn a blind eye more often now than later on! ;-)

‎ISE Nostalgia.tmTheme‎

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,280 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>author</key>
6+
<string>Guillermo López-Anglada</string>
7+
<key>name</key>
8+
<string>ISE Nostalgia</string>
9+
<key>settings</key>
10+
<array>
11+
<dict>
12+
<key>settings</key>
13+
<dict>
14+
<key>gutterForeground</key>
15+
<string>#5AB1CD</string>
16+
<key>background</key>
17+
<string>#FFFFFF</string>
18+
<key>foreground</key>
19+
<string>#8A2BE2</string>
20+
<key>caret</key>
21+
<string>#7F7F7F</string>
22+
<!-- <key>invisibles</key>
23+
<string>#7F7F7F</string>
24+
--> <key>lineHighlight</key>
25+
<string>#FEF8DA</string>
26+
<key>selection</key>
27+
<string>#ADD6FF</string>
28+
<key>selectionBorder</key>
29+
<string>#87BEFF</string>
30+
<key>inactiveSelection</key>
31+
<string>#E3F1FF</string>
32+
</dict>
33+
</dict>
34+
<dict>
35+
<key>name</key>
36+
<string>Comment</string>
37+
<key>scope</key>
38+
<string>comment</string>
39+
<key>settings</key>
40+
<dict>
41+
<key>fontStyle</key>
42+
<string>normal</string>
43+
<key>foreground</key>
44+
<string>#006400</string>
45+
</dict>
46+
</dict>
47+
<dict>
48+
<key>name</key>
49+
<string>Keyword</string>
50+
<key>scope</key>
51+
<string>keyword, storage</string>
52+
<key>settings</key>
53+
<dict>
54+
<key>foreground</key>
55+
<string>#292929</string>
56+
</dict>
57+
</dict>
58+
<dict>
59+
<key>name</key>
60+
<string>Number</string>
61+
<key>scope</key>
62+
<string>constant.numeric</string>
63+
<key>settings</key>
64+
<dict>
65+
<key>fontStyle</key>
66+
<string></string>
67+
<key>foreground</key>
68+
<string>#801E92</string>
69+
</dict>
70+
</dict>
71+
<dict>
72+
<key>name</key>
73+
<string>Built-in constant</string>
74+
<key>scope</key>
75+
<string>constant.language</string>
76+
<key>settings</key>
77+
<dict>
78+
<key>foreground</key>
79+
<string>#585CF6</string>
80+
</dict>
81+
</dict>
82+
<dict>
83+
<key>name</key>
84+
<string>Variable</string>
85+
<key>scope</key>
86+
<string>variable.language, variable.other</string>
87+
<key>settings</key>
88+
<dict>
89+
<key>fontStyle</key>
90+
<string></string>
91+
<key>foreground</key>
92+
<string>#FF4500</string>
93+
</dict>
94+
</dict>
95+
<dict>
96+
<key>name</key>
97+
<string>String</string>
98+
<key>scope</key>
99+
<string>string</string>
100+
<key>settings</key>
101+
<dict>
102+
<key>fontStyle</key>
103+
<string></string>
104+
<key>foreground</key>
105+
<string>#6B0000</string>
106+
</dict>
107+
</dict>
108+
<dict>
109+
<key>name</key>
110+
<string>String interpolation</string>
111+
<key>scope</key>
112+
<string>constant.character.escape, string source</string>
113+
<key>settings</key>
114+
<dict>
115+
<key>fontStyle</key>
116+
<string></string>
117+
<key>foreground</key>
118+
<string>#AA69B6</string>
119+
</dict>
120+
</dict>
121+
<!-- <dict>
122+
<key>name</key>
123+
<string>Function name</string>
124+
<key>scope</key>
125+
<string>entity.name.function, support.function.any-method</string>
126+
<key>settings</key>
127+
<dict>
128+
<key>fontStyle</key>
129+
<string>bold</string>
130+
<key>foreground</key>
131+
<string>#0000FF</string>
132+
</dict>
133+
</dict>
134+
--><!-- <dict>
135+
<key>name</key>
136+
<string>Type name</string>
137+
<key>scope</key>
138+
<string>entity.name.type</string>
139+
<key>settings</key>
140+
<dict>
141+
<key>fontStyle</key>
142+
<string>underline</string>
143+
</dict>
144+
</dict>
145+
<dict>
146+
<key>name</key>
147+
<string>Inherited class name</string>
148+
<key>scope</key>
149+
<string>entity.other.inherited-class</string>
150+
<key>settings</key>
151+
<dict>
152+
<key>fontStyle</key>
153+
<string>italic</string>
154+
</dict>
155+
</dict> -->
156+
<!-- <dict>
157+
<key>name</key>
158+
<string>Function parameter</string>
159+
<key>scope</key>
160+
<string>variable.parameter</string>
161+
<key>settings</key>
162+
<dict>
163+
<key>fontStyle</key>
164+
<string>italic</string>
165+
</dict>
166+
</dict> -->
167+
<!-- <dict>
168+
<key>name</key>
169+
<string>Function argument and result types</string>
170+
<key>scope</key>
171+
<string>storage.type.method</string>
172+
<key>settings</key>
173+
<dict>
174+
<key>fontStyle</key>
175+
<string></string>
176+
<key>foreground</key>
177+
<string>#70727E</string>
178+
</dict>
179+
</dict> -->
180+
<!-- <dict>
181+
<key>name</key>
182+
<string>Section</string>
183+
<key>scope</key>
184+
<string>meta.section entity.name.section, declaration.section entity.name.section</string>
185+
<key>settings</key>
186+
<dict>
187+
<key>fontStyle</key>
188+
<string>italic</string>
189+
</dict>
190+
</dict> -->
191+
<dict>
192+
<key>name</key>
193+
<string>Library function</string>
194+
<key>scope</key>
195+
<string>support.function</string>
196+
<key>settings</key>
197+
<dict>
198+
<key>foreground</key>
199+
<string>#0000FF</string>
200+
</dict>
201+
</dict>
202+
<!-- <dict>
203+
<key>name</key>
204+
<string>Library object</string>
205+
<key>scope</key>
206+
<string>support.class, support.type</string>
207+
<key>settings</key>
208+
<dict>
209+
<key>fontStyle</key>
210+
<string>bold</string>
211+
<key>foreground</key>
212+
<string>#6D79DE</string>
213+
</dict>
214+
</dict> -->
215+
<!-- <dict>
216+
<key>name</key>
217+
<string>Library constant</string>
218+
<key>scope</key>
219+
<string>support.constant</string>
220+
<key>settings</key>
221+
<dict>
222+
<key>fontStyle</key>
223+
<string>bold</string>
224+
<key>foreground</key>
225+
<string>#06960E</string>
226+
</dict>
227+
</dict> -->
228+
<!-- <dict>
229+
<key>name</key>
230+
<string>Library variable</string>
231+
<key>scope</key>
232+
<string>support.variable</string>
233+
<key>settings</key>
234+
<dict>
235+
<key>fontStyle</key>
236+
<string>bold</string>
237+
<key>foreground</key>
238+
<string>#21439C</string>
239+
</dict>
240+
</dict> -->
241+
<dict>
242+
<key>name</key>
243+
<string>PowerShell: Assignment Operator</string>
244+
<key>scope</key>
245+
<string>keyword.operator.assignment.powershell</string>
246+
<key>settings</key>
247+
<dict>
248+
<key>foreground</key>
249+
<string>#A9A9A9</string>
250+
</dict>
251+
</dict>
252+
<dict>
253+
<key>name</key>
254+
<string>Invalid</string>
255+
<key>scope</key>
256+
<string>invalid</string>
257+
<key>settings</key>
258+
<dict>
259+
<key>background</key>
260+
<string>#B85B44</string>
261+
<key>foreground</key>
262+
<string>#FFFF00</string>
263+
</dict>
264+
</dict>
265+
<dict>
266+
<key>name</key>
267+
<string>Invalid trailing whitespace</string>
268+
<key>scope</key>
269+
<string>invalid.deprecated.trailing-whitespace</string>
270+
<key>settings</key>
271+
<dict>
272+
<key>background</key>
273+
<string>#B85B44</string>
274+
</dict>
275+
</dict>
276+
</array>
277+
<key>uuid</key>
278+
<string>71D40D9D-AE48-11D9-920A-000D93589AF6</string>
279+
</dict>
280+
</plist>

‎PowerShell.sublime-project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
"build_systems": [
1111
{
12-
"name": "Run",
13-
"shell_cmd": "powershell.exe -noninteractive -file $project_path/bin/Build-Folder.ps1"
12+
"name": "PowerShell: Build Dev Version",
13+
"shell_cmd": "powershell.exe -noninteractive -file $project_path/bin/BuildFolder.ps1"
1414
}
1515
]
1616
}

0 commit comments

Comments
 (0)