Skip to content

Commit 7c4525f

Browse files
codecadwalladercodecadwallader
committed
Some minor ordering tweaks following #69.
1 parent 25239df commit 7c4525f

File tree

12 files changed

+29
-31
lines changed

12 files changed

+29
-31
lines changed

‎CodeMaid.IntegrationTests/Cleaning/FileTypes/PHPTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region CodeMaid is Copyright 2007-2014 Steve Cadwallader.
1+
#region CodeMaid is Copyright 2007-2015 Steve Cadwallader.
22

33
// CodeMaid is free software: you can redistribute it and/or modify it under the terms of the GNU
44
// Lesser General Public License version 3 as published by the Free Software Foundation.
@@ -7,7 +7,7 @@
77
// even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
88
// Lesser General Public License for more details <http://www.gnu.org/licenses/>.
99

10-
#endregion CodeMaid is Copyright 2007-2014 Steve Cadwallader.
10+
#endregion CodeMaid is Copyright 2007-2015 Steve Cadwallader.
1111

1212
using EnvDTE;
1313
using Microsoft.VisualStudio.TestTools.UnitTesting;

‎CodeMaid/Helpers/CodeCommentHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ internal static string SpaceToFake(string value)
176176
return value.Replace(Spacer, KeepTogetherSpacer);
177177
}
178178
}
179-
}
179+
}

‎CodeMaid/Logic/Cleaning/CodeCleanupAvailabilityLogic.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,12 @@ private bool IsProjectItemLanguageIncludedByOptions(ProjectItem projectItem)
331331
case "{71d61d27-9011-4b17-9469-d20f798fb5c0}": return Settings.Default.Cleaning_IncludeJavaScript;
332332
case "{18588c2a-9945-44ad-9894-b271babc0582}": return Settings.Default.Cleaning_IncludeJSON;
333333
case "{7b22909e-1b53-4cc7-8c2b-1f5c5039693a}": return Settings.Default.Cleaning_IncludeLESS;
334+
case "{16b0638d-251a-4705-98d2-5251112c4139}": return Settings.Default.Cleaning_IncludePHP;
334335
case "{5fa499f6-2cec-435b-bfce-53bbe29f37f6}": return Settings.Default.Cleaning_IncludeSCSS;
335336
case "{4a0dddb5-7a95-4fbf-97cc-616d07737a77}": return Settings.Default.Cleaning_IncludeTypeScript;
336337
case "{e34acdc0-baae-11d0-88bf-00a0c9110049}": return Settings.Default.Cleaning_IncludeVB;
337338
case "{c9164055-039b-4669-832d-f257bd5554d4}": return Settings.Default.Cleaning_IncludeXAML;
338339
case "{f6819a78-a205-47b5-be1c-675b3c7f0b8e}": return Settings.Default.Cleaning_IncludeXML;
339-
case "{16b0638d-251a-4705-98d2-5251112c4139}": return Settings.Default.Cleaning_IncludePHP;
340340
default:
341341
OutputWindowHelper.DiagnosticWriteLine(
342342
string.Format("CodeCleanupAvailabilityLogic.IsProjectItemLanguageIncludedByOptions picked up an unrecognized language service guid '{0}'", languageServiceGuid));

‎CodeMaid/Logic/Cleaning/CodeCleanupManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ private Action<Document, bool> FindCodeCleanupMethod(Document document)
216216
case "JScript":
217217
case "JSON":
218218
case "LESS":
219+
case "PHP":
219220
case "SCSS":
220221
case "TypeScript":
221-
case "PHP":
222222
return RunCodeCleanupC;
223223

224224
case "HTML":
@@ -529,4 +529,4 @@ private void ExecuteCommand(TextDocument textDocument, params string[] commandNa
529529

530530
#endregion Private Cleanup Methods
531531
}
532-
}
532+
}

‎CodeMaid/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeMaid/UI/Dialogs/Options/Cleaning/CleaningFileTypesDataTemplate.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
<ColumnDefinition Width="Auto" />
2424
<ColumnDefinition Width="10" />
2525
<ColumnDefinition Width="Auto" />
26-
<ColumnDefinition Width="10" />
27-
<ColumnDefinition Width="Auto" />
2826
</Grid.ColumnDefinitions>
2927

3028
<CheckBox Grid.Row="0" Grid.Column="0" Content="C#" IsChecked="{Binding IncludeCSharp}" />
3129
<CheckBox Grid.Row="0" Grid.Column="2" Content="C++" IsChecked="{Binding IncludeCPlusPlus}" />
3230
<CheckBox Grid.Row="0" Grid.Column="4" Content="F#" IsChecked="{Binding IncludeFSharp}" />
3331
<CheckBox Grid.Row="0" Grid.Column="6" Content="VB" IsChecked="{Binding IncludeVisualBasic}" />
32+
<CheckBox Grid.Row="0" Grid.Column="8" Content="PHP" IsChecked="{Binding IncludePHP}" />
3433

3534
<CheckBox Grid.Row="1" Grid.Column="0" Content="JSON" IsChecked="{Binding IncludeJSON}" />
3635
<CheckBox Grid.Row="1" Grid.Column="2" Content="XAML" IsChecked="{Binding IncludeXAML}" />
@@ -42,7 +41,6 @@
4241
<CheckBox Grid.Row="2" Grid.Column="6" Content="SCSS" IsChecked="{Binding IncludeSCSS}" />
4342
<CheckBox Grid.Row="2" Grid.Column="8" Content="JavaScript" IsChecked="{Binding IncludeJavaScript}" />
4443
<CheckBox Grid.Row="2" Grid.Column="10" Content="TypeScript" IsChecked="{Binding IncludeTypeScript}" />
45-
<CheckBox Grid.Row="2" Grid.Column="12" Content="PHP" IsChecked="{Binding IncludePHP}" />
4644
</Grid>
4745
</GroupBox>
4846

@@ -58,4 +56,4 @@
5856
</GroupBox>
5957
</StackPanel>
6058
</DataTemplate>
61-
</ResourceDictionary>
59+
</ResourceDictionary>

‎CodeMaid/UI/Dialogs/Options/Cleaning/CleaningFileTypesViewModel.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public override void LoadSettings()
5656
IncludeJavaScript = Settings.Default.Cleaning_IncludeJavaScript;
5757
IncludeJSON = Settings.Default.Cleaning_IncludeJSON;
5858
IncludeLESS = Settings.Default.Cleaning_IncludeLESS;
59+
IncludePHP = Settings.Default.Cleaning_IncludePHP;
5960
IncludeSCSS = Settings.Default.Cleaning_IncludeSCSS;
6061
IncludeTypeScript = Settings.Default.Cleaning_IncludeTypeScript;
6162
IncludeVisualBasic = Settings.Default.Cleaning_IncludeVB;
6263
IncludeXAML = Settings.Default.Cleaning_IncludeXAML;
6364
IncludeXML = Settings.Default.Cleaning_IncludeXML;
64-
IncludePHP = Settings.Default.Cleaning_IncludePHP;
6565
}
6666

6767
/// <summary>
@@ -79,12 +79,12 @@ public override void SaveSettings()
7979
Settings.Default.Cleaning_IncludeJavaScript = IncludeJavaScript;
8080
Settings.Default.Cleaning_IncludeJSON = IncludeJSON;
8181
Settings.Default.Cleaning_IncludeLESS = IncludeLESS;
82+
Settings.Default.Cleaning_IncludePHP = IncludePHP;
8283
Settings.Default.Cleaning_IncludeSCSS = IncludeSCSS;
8384
Settings.Default.Cleaning_IncludeTypeScript = IncludeTypeScript;
8485
Settings.Default.Cleaning_IncludeVB = IncludeVisualBasic;
8586
Settings.Default.Cleaning_IncludeXAML = IncludeXAML;
8687
Settings.Default.Cleaning_IncludeXML = IncludeXML;
87-
Settings.Default.Cleaning_IncludePHP = IncludePHP;
8888
}
8989

9090
#endregion Overrides of OptionsPageViewModel
@@ -181,6 +181,15 @@ public bool IncludeLESS
181181
set { SetPropertyValue(value); }
182182
}
183183

184+
/// <summary>
185+
/// Gets or sets the flag indicating if PHP files should be included.
186+
/// </summary>
187+
public bool IncludePHP
188+
{
189+
get { return GetPropertyValue<bool>(); }
190+
set { SetPropertyValue(value); }
191+
}
192+
184193
/// <summary>
185194
/// Gets or sets the flag indicating if SCSS files should be included.
186195
/// </summary>
@@ -226,15 +235,6 @@ public bool IncludeXML
226235
set { SetPropertyValue(value); }
227236
}
228237

229-
/// <summary>
230-
/// Gets or sets the flag indicating if PHP files should be included.
231-
/// </summary>
232-
public bool IncludePHP
233-
{
234-
get { return GetPropertyValue<bool>(); }
235-
set { SetPropertyValue(value); }
236-
}
237-
238238
#endregion Options
239239
}
240-
}
240+
}

‎CodeMaid/VSPackage.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeMaid/VSPackage.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<comment>Package name</comment>
123123
</data>
124124
<data name="112" xml:space="preserve">
125-
<value>CodeMaid is an open source Visual Studio extension to cleanup, dig through and simplify our C#, C++, F#, VB, JSON, XAML, XML, ASP, HTML, CSS, LESS, SCSS, JavaScript, TypeScript and PHP coding.
125+
<value>CodeMaid is an open source Visual Studio extension to cleanup, dig through and simplify our C#, C++, F#, VB, PHP, JSON, XAML, XML, ASP, HTML, CSS, LESS, SCSS, JavaScript and TypeScript coding.
126126

127127
Written by Steve Cadwallader, for more information visit http://www.codemaid.net/</value>
128128
<comment>Package description</comment>

‎CodeMaid/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,4 +484,4 @@
484484
<startup>
485485
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
486486
</startup>
487-
</configuration>
487+
</configuration>

0 commit comments

Comments
 (0)