Skip to content
This repository was archived by the owner on Aug 9, 2025. It is now read-only.

Commit af31e35

Browse files
VioletGiraffeVioletGiraffe
committed
Code formatting, v. 1.3.6
1 parent ccda294 commit af31e35

File tree

3 files changed

+138
-138
lines changed

3 files changed

+138
-138
lines changed

‎CPPCheckPlugin/MainToolWindowUI.xaml.cs‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public class OpenProblemInEditorEventArgs : EventArgs
3838

3939
private static int iconSize = 20;
4040

41-
private GridViewColumnHeader listViewSortCol = null;
42-
private SortAdorner listViewSortAdorner = null;
41+
private GridViewColumnHeader listViewSortCol = null;
42+
private SortAdorner listViewSortAdorner = null;
4343

4444
public MainToolWindowUI()
4545
{
@@ -127,54 +127,54 @@ public static TParent FindVisualParent<TParent, TLimit>(DependencyObject obj) wh
127127
return obj as TParent;
128128
}
129129

130-
private void problemColumnHeader_Click(object sender, RoutedEventArgs e)
131-
{
132-
GridViewColumnHeader column = (sender as GridViewColumnHeader);
133-
string sortBy = column.Tag.ToString();
134-
135-
ClearSorting();
136-
137-
ListSortDirection newDir = ListSortDirection.Ascending;
138-
if (listViewSortCol == column && listViewSortAdorner.Direction == newDir)
139-
{
140-
newDir = ListSortDirection.Descending;
141-
}
142-
143-
listViewSortCol = column;
144-
listViewSortAdorner = new SortAdorner(listViewSortCol, newDir);
145-
AdornerLayer.GetAdornerLayer(listViewSortCol).Add(listViewSortAdorner);
146-
147-
if (sortBy == "Severity")
148-
{
149-
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
150-
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
151-
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
152-
}
153-
else if (sortBy == "FileName")
154-
{
155-
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
156-
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
157-
}
158-
else if (sortBy == "Message")
159-
{
160-
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
161-
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
162-
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
163-
}
164-
else
165-
{
166-
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
167-
}
168-
}
169-
170-
public void ClearSorting()
171-
{
172-
if(listViewSortCol != null)
173-
{
174-
AdornerLayer.GetAdornerLayer(listViewSortCol).Remove(listViewSortAdorner);
175-
listView.Items.SortDescriptions.Clear();
176-
}
177-
}
130+
private void problemColumnHeader_Click(object sender, RoutedEventArgs e)
131+
{
132+
GridViewColumnHeader column = (sender as GridViewColumnHeader);
133+
string sortBy = column.Tag.ToString();
134+
135+
ClearSorting();
136+
137+
ListSortDirection newDir = ListSortDirection.Ascending;
138+
if (listViewSortCol == column && listViewSortAdorner.Direction == newDir)
139+
{
140+
newDir = ListSortDirection.Descending;
141+
}
142+
143+
listViewSortCol = column;
144+
listViewSortAdorner = new SortAdorner(listViewSortCol, newDir);
145+
AdornerLayer.GetAdornerLayer(listViewSortCol).Add(listViewSortAdorner);
146+
147+
if (sortBy == "Severity")
148+
{
149+
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
150+
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
151+
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
152+
}
153+
else if (sortBy == "FileName")
154+
{
155+
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
156+
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
157+
}
158+
else if (sortBy == "Message")
159+
{
160+
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
161+
listView.Items.SortDescriptions.Add(new SortDescription("FileName", ListSortDirection.Ascending));
162+
listView.Items.SortDescriptions.Add(new SortDescription("Line", ListSortDirection.Ascending));
163+
}
164+
else
165+
{
166+
listView.Items.SortDescriptions.Add(new SortDescription(sortBy, newDir));
167+
}
168+
}
169+
170+
public void ClearSorting()
171+
{
172+
if (listViewSortCol != null)
173+
{
174+
AdornerLayer.GetAdornerLayer(listViewSortCol).Remove(listViewSortAdorner);
175+
listView.Items.SortDescriptions.Clear();
176+
}
177+
}
178178

179179
public class ProblemsListItem
180180
{
@@ -199,10 +199,10 @@ public int Line
199199
get { return _problem.Line; }
200200
}
201201

202-
public Problem.SeverityLevel Severity
203-
{
204-
get { return _problem.Severity; }
205-
}
202+
public Problem.SeverityLevel Severity
203+
{
204+
get { return _problem.Severity; }
205+
}
206206

207207
public ImageSource Icon
208208
{
@@ -259,15 +259,15 @@ public Problem Problem
259259

260260
Problem _problem;
261261
}
262-
private void ListView_SelectionChanged()
263-
{
264-
}
265-
private void ListView_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
266-
{
267-
}
268-
private void ListView_SelectionChanged_2(object sender, SelectionChangedEventArgs e)
269-
{
270-
}
262+
private void ListView_SelectionChanged()
263+
{
264+
}
265+
private void ListView_SelectionChanged_1(object sender, SelectionChangedEventArgs e)
266+
{
267+
}
268+
private void ListView_SelectionChanged_2(object sender, SelectionChangedEventArgs e)
269+
{
270+
}
271271
}
272272

273273
public class DeleteObjectInvoker
@@ -276,39 +276,39 @@ public class DeleteObjectInvoker
276276
public static extern bool DeleteObject(IntPtr hObject);
277277
}
278278

279-
public class SortAdorner : Adorner
280-
{
281-
private static Geometry ascGeometry = Geometry.Parse("M 0 4 L 3.5 0 L 7 4 Z");
282-
private static Geometry descGeometry = Geometry.Parse("M 0 0 L 3.5 4 L 7 0 Z");
283-
284-
public ListSortDirection Direction { get; private set; }
285-
286-
public SortAdorner(UIElement element, ListSortDirection dir)
287-
: base(element)
288-
{
289-
this.Direction = dir;
290-
}
291-
292-
protected override void OnRender(DrawingContext drawingContext)
293-
{
294-
base.OnRender(drawingContext);
295-
296-
if (AdornedElement.RenderSize.Width < 20)
297-
{
298-
return;
299-
}
300-
301-
TranslateTransform transform = new TranslateTransform(AdornedElement.RenderSize.Width - 15, (AdornedElement.RenderSize.Height - 5) / 2);
302-
drawingContext.PushTransform(transform);
303-
304-
Geometry geometry = ascGeometry;
305-
if (this.Direction == ListSortDirection.Descending)
306-
{
307-
geometry = descGeometry;
308-
}
309-
drawingContext.DrawGeometry(System.Windows.Media.Brushes.Black, null, geometry);
310-
311-
drawingContext.Pop();
312-
}
313-
}
279+
public class SortAdorner : Adorner
280+
{
281+
private static Geometry ascGeometry = Geometry.Parse("M 0 4 L 3.5 0 L 7 4 Z");
282+
private static Geometry descGeometry = Geometry.Parse("M 0 0 L 3.5 4 L 7 0 Z");
283+
284+
public ListSortDirection Direction { get; private set; }
285+
286+
public SortAdorner(UIElement element, ListSortDirection dir)
287+
: base(element)
288+
{
289+
this.Direction = dir;
290+
}
291+
292+
protected override void OnRender(DrawingContext drawingContext)
293+
{
294+
base.OnRender(drawingContext);
295+
296+
if (AdornedElement.RenderSize.Width < 20)
297+
{
298+
return;
299+
}
300+
301+
TranslateTransform transform = new TranslateTransform(AdornedElement.RenderSize.Width - 15, (AdornedElement.RenderSize.Height - 5) / 2);
302+
drawingContext.PushTransform(transform);
303+
304+
Geometry geometry = ascGeometry;
305+
if (this.Direction == ListSortDirection.Descending)
306+
{
307+
geometry = descGeometry;
308+
}
309+
drawingContext.DrawGeometry(System.Windows.Media.Brushes.Black, null, geometry);
310+
311+
drawingContext.Pop();
312+
}
313+
}
314314
}

‎CPPCheckPlugin/app.config‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6-
</sectionGroup>
7-
</configSections>
8-
<userSettings>
9-
<VSPackage.CPPCheckPlugin.Properties.Settings>
10-
<setting name="CPPcheckPath" serializeAs="Xml">
11-
<value>
12-
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
13-
<string>C:\Program Files (x86)\Cppcheck\cppcheck.exe</string>
14-
<string>C:\Program Files\Cppcheck\cppcheck.exe</string>
15-
</ArrayOfString>
16-
</value>
17-
</setting>
18-
<setting name="InconclusiveChecksEnabled" serializeAs="String">
19-
<value>False</value>
20-
</setting>
21-
<setting name="DefaultArguments" serializeAs="String">
22-
<value/>
23-
</setting>
24-
<setting name="ProjectOnlyCheckCurrentConfig" serializeAs="String">
25-
<value>False</value>
26-
</setting>
27-
<setting name="FileOnlyCheckCurrentConfig" serializeAs="String">
28-
<value>True</value>
29-
</setting>
30-
<setting name="SeveritiesString" serializeAs="String">
31-
<value>style,information,warning,performance,portability</value>
32-
</setting>
33-
<setting name="SuppressionsString" serializeAs="String">
34-
<value>unmatchedSuppression</value>
35-
</setting>
36-
<setting name="IgnoreIncludePaths" serializeAs="String">
37-
<value>False</value>
38-
</setting>
39-
</VSPackage.CPPCheckPlugin.Properties.Settings>
40-
</userSettings>
41-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="VSPackage.CPPCheckPlugin.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<VSPackage.CPPCheckPlugin.Properties.Settings>
10+
<setting name="CPPcheckPath" serializeAs="Xml">
11+
<value>
12+
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
13+
<string>C:\Program Files (x86)\Cppcheck\cppcheck.exe</string>
14+
<string>C:\Program Files\Cppcheck\cppcheck.exe</string>
15+
</ArrayOfString>
16+
</value>
17+
</setting>
18+
<setting name="InconclusiveChecksEnabled" serializeAs="String">
19+
<value>False</value>
20+
</setting>
21+
<setting name="DefaultArguments" serializeAs="String">
22+
<value/>
23+
</setting>
24+
<setting name="ProjectOnlyCheckCurrentConfig" serializeAs="String">
25+
<value>False</value>
26+
</setting>
27+
<setting name="FileOnlyCheckCurrentConfig" serializeAs="String">
28+
<value>True</value>
29+
</setting>
30+
<setting name="SeveritiesString" serializeAs="String">
31+
<value>style,information,warning,performance,portability</value>
32+
</setting>
33+
<setting name="SuppressionsString" serializeAs="String">
34+
<value>unmatchedSuppression</value>
35+
</setting>
36+
<setting name="IgnoreIncludePaths" serializeAs="String">
37+
<value>False</value>
38+
</setting>
39+
</VSPackage.CPPCheckPlugin.Properties.Settings>
40+
</userSettings>
41+
<startup/></configuration>

‎CPPCheckPlugin/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="127d8bd3-8cd7-491a-9a63-9b4e89118da9" Version="1.3.5" Language="en-US" Publisher="VioletGiraffe et. al." />
4+
<Identity Id="127d8bd3-8cd7-491a-9a63-9b4e89118da9" Version="1.3.6" Language="en-US" Publisher="VioletGiraffe et. al." />
55
<DisplayName>cppcheck add-in</DisplayName>
66
<Description xml:space="preserve">Integration for cppcheck - C/C++ code static analysis tool </Description>
77
<License>PackageInstallerLicense.txt</License>

0 commit comments

Comments
 (0)