From bd9bd1d2971c64e250079f9f220ee89af9c5e22e Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sun, 29 Nov 2020 14:25:49 +0000 Subject: [PATCH] VisualStudio Code cleanup with custom profile --- .../Advanced Software Engineering/.editorconfig | 4 ++++ .../Advanced Software Engineering.csproj | 1 + .../Advanced Software Engineering.sln | 7 ++++++- .../Advanced Software Engineering/HelperFunctions.cs | 4 ++-- .../Verbs/Value/DeclareVariable.cs | 6 +++--- .../Verbs/Value/ValueHelper.cs | 6 +++--- .../Verbs/Value/ValueObjects/ColorValue.cs | 10 +++++----- .../Verbs/Value/ValueObjects/PointValue.cs | 4 ++-- .../Verbs/Value/ValueTypes/BoolValue.cs | 4 ++-- .../Verbs/Value/ValueTypes/ComparisonValue.cs | 6 +++--- .../Verbs/Value/ValueTypes/DoubleValue.cs | 4 ++-- .../Verbs/Value/ValueTypes/ExpressionValue.cs | 6 +++--- .../Verbs/Value/ValueTypes/IntValue.cs | 2 +- .../Verbs/Value/ValueTypes/VariableValue.cs | 4 ++-- .../Windows/DrawPreview.cs | 2 +- 15 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 Advanced Software Engineering/Advanced Software Engineering/.editorconfig diff --git a/Advanced Software Engineering/Advanced Software Engineering/.editorconfig b/Advanced Software Engineering/Advanced Software Engineering/.editorconfig new file mode 100644 index 0000000..d2741cf --- /dev/null +++ b/Advanced Software Engineering/Advanced Software Engineering/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# CS1591: Missing XML comment for publicly visible type or member +dotnet_diagnostic.CS1591.severity = suggestion diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj index 8ba56ef..e3012fe 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj +++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj @@ -178,6 +178,7 @@ Designer Resources.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.sln b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.sln index 8020823..89cfb3d 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.sln +++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.sln @@ -5,7 +5,12 @@ VisualStudioVersion = 16.0.30503.244 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced Software Engineering", "Advanced Software Engineering.csproj", "{B9DF94A0-9DFB-4F1E-B126-38DFBBE72C0C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Advanced Software Engineering Tests", "..\Advanced Software Engineering Tests\Advanced Software Engineering Tests.csproj", "{3CD5C4CF-DA9E-41B2-8718-17217DB8BCD5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Advanced Software Engineering Tests", "..\Advanced Software Engineering Tests\Advanced Software Engineering Tests.csproj", "{3CD5C4CF-DA9E-41B2-8718-17217DB8BCD5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D7948692-84F9-491E-8C8A-5B754BCB74F1}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs b/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs index 22385b7..77485d2 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs @@ -3,8 +3,8 @@ namespace Advanced_Software_Engineering { public class CommandAndParameterParserResult { - private string command; - private string[] parameters; + private readonly string command; + private readonly string[] parameters; public CommandAndParameterParserResult(string command, string[] parameters) { this.command = command; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs index 9316480..9a622d7 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs @@ -4,9 +4,9 @@ using System; namespace Advanced_Software_Engineering.Verbs.Value { public class DeclareVariable : IVerb { - private Drawer drawer; - private IValue value; - private string name; + private readonly Drawer drawer; + private readonly IValue value; + private readonly string name; //Common characters that people might try private static readonly char[] illegalCharacters = "1234567890!?/+- \"'@#~;:><,.`¬|[]{}\\£$%^&*()".ToCharArray(); diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs index c8d85bb..8ceb09a 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs @@ -129,19 +129,19 @@ namespace Advanced_Software_Engineering.Verbs.Value { if (!text.Contains(".")) try { return ValueFactory.CreateValue(text, "int"); - } catch (Exception e) { } + } catch (Exception) { } //Check if string is a double else try { return ValueFactory.CreateValue(text, "double"); - } catch (Exception e) { } + } catch (Exception) { } } //Check if color try { return ValueFactory.CreateValue(text, "color"); - } catch (Exception e) { } + } catch (Exception) { } } else { //Check if string is a bool TODO diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs index 81c6458..7e8b1ce 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs @@ -4,12 +4,12 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects { internal class ColorValue : IValue { - private IValue r; - private IValue g; - private IValue b; + private readonly IValue r; + private readonly IValue g; + private readonly IValue b; - private bool hasAlpha; - private IValue a; + private readonly bool hasAlpha; + private readonly IValue a; public ColorValue(Color value) { r = new IntValue(value.R); diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs index e846fd7..f2544f1 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs @@ -3,8 +3,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects { public class PointValue { - private IValue x; - private IValue y; + private readonly IValue x; + private readonly IValue y; public PointValue(IValue x, IValue y) { this.x = x; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs index f6ad676..0a54b93 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs @@ -4,9 +4,9 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class BoolValue : IValue { - private bool initialised = false; + private readonly bool initialised = false; - private bool value; + private readonly bool value; public BoolValue(bool value) { this.value = value; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ComparisonValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ComparisonValue.cs index 53e1739..caa8c2f 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ComparisonValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ComparisonValue.cs @@ -4,9 +4,9 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class ComparisonValue : IValue { - private string op; - private IValue value1; - private IValue value2; + private readonly string op; + private readonly IValue value1; + private readonly IValue value2; public ComparisonValue(IValue value1, IValue value2, string op) { this.value1 = value1; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs index 0a50ab6..c27cd79 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs @@ -4,12 +4,12 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class DoubleValue : IValue { - private bool initialised = false; + private readonly bool initialised = false; private bool colorValueCacheAvailable = false; private Color colorValueCache; - private double value; + private readonly double value; public DoubleValue(double value) { this.value = value; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs index 3a151ed..ed4ce66 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs @@ -9,9 +9,9 @@ namespace Advanced_Software_Engineering.Verbs.Value { public const int MULTIPLY = 2; public const int DIVIDE = 3; - private IValue variable1; - private IValue variable2; - private int operation; + private readonly IValue variable1; + private readonly IValue variable2; + private readonly int operation; private bool evaluated = false; private IValue evaluatedValue; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs index 3a890f5..24977a5 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs @@ -6,7 +6,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class IntValue : IValue { private readonly bool initialised = false; - private int value; + private readonly int value; private bool doubleValueCacheAvaiable = false; private double doubleValueCache; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/VariableValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/VariableValue.cs index a34aa95..f0fc516 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/VariableValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/VariableValue.cs @@ -4,8 +4,8 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { public class VariableValue : IValue { - private Drawer drawer; - private string variableName; + private readonly Drawer drawer; + private readonly string variableName; public VariableValue(Drawer drawer, string variableName) { this.variableName = variableName; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs index 3e3c308..5d19065 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Windows/DrawPreview.cs @@ -6,7 +6,7 @@ namespace Advanced_Software_Engineering { public partial class Draw_Preview : Form { private Graphics graphics; - private Commander commander; + private readonly Commander commander; private bool pardonCommands; ///