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

Apply editorconfig #36

Merged
merged 2 commits into from
Mar 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = true
csharp_space_between_method_call_name_and_opening_parenthesis = true
csharp_space_after_keywords_in_control_flow_statements = true

# spaces before []
csharp_space_before_open_square_brackets = true

# Newline settings
csharp_new_line_before_open_brace = types,methods
csharp_new_line_before_else = true
Expand Down
17 changes: 7 additions & 10 deletions src/Gir.Tests/BitFieldTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.IO;
using System.Linq;
using System.Text;


using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -10,10 +7,10 @@ namespace Gir.Tests
public class BitFieldTests : GenerationTestBase
{
[Test]
public void GenerateDocumentationWhenCompatFalse()
public void GenerateDocumentationWhenCompatFalse ()
{
var result = GenerateType(Pango, "FontMask");
Assert.AreEqual(@"namespace Pango
var result = GenerateType (Pango, "FontMask");
Assert.AreEqual (@"namespace Pango
{
///<summary>
/// The bits in a #PangoFontMask correspond to fields in a
Expand Down Expand Up @@ -48,11 +45,11 @@ public enum FontMask
}

[Test]
public void GenerateNoDocumentationWhenCompatTrue()
public void GenerateNoDocumentationWhenCompatTrue ()
{
var result = GenerateType(Pango, "FontMask", compat: true);
var result = GenerateType (Pango, "FontMask", compat: true);

Assert.AreEqual(@"namespace Pango
Assert.AreEqual (@"namespace Pango
{
[Flags]
public enum FontMask
Expand Down
9 changes: 4 additions & 5 deletions src/Gir.Tests/ClassTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;


using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -8,14 +7,14 @@ namespace Gir.Tests
public class ClassTests : GenerationTestBase
{
[Test]
public void TestClassIsGenerated()
public void TestClassIsGenerated ()
{
// Test is incomplete, as record is not fully generated atm.
var result = GenerateType(Gio2, "BufferedOutputStream");
var result = GenerateType (Gio2, "BufferedOutputStream");


// Need to map pointers at symbol level.
Assert.AreEqual(@"namespace Gio
Assert.AreEqual (@"namespace Gio
{
///<summary>
/// Buffered output stream implements #GFilterOutputStream and provides
Expand Down
9 changes: 3 additions & 6 deletions src/Gir.Tests/EnumerationTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.IO;
using System.Linq;
using System.Text;

using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -12,9 +9,9 @@ public class Enumeration : GenerationTestBase
[Test]
public void PangoAlignmentIsGenerated ()
{
var result = GenerateType(Pango, "Alignment");
var result = GenerateType (Pango, "Alignment");

Assert.AreEqual(@"namespace Pango
Assert.AreEqual (@"namespace Pango
{
///<summary>
/// A #PangoAlignment describes how to align the lines of a #PangoLayout within the
Expand Down
8 changes: 4 additions & 4 deletions src/Gir.Tests/FunctionTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;

using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -7,12 +7,12 @@ namespace Gir.Tests
public class FunctionTests : GenerationTestBase
{
[Test]
public void TestRecordFunctionIsGenerated()
public void TestRecordFunctionIsGenerated ()
{
// Test is incomplete, as record is not fully generated atm.
var result = GenerateMember(GLib, "ByteArray", "append");
var result = GenerateMember (GLib, "ByteArray", "append");

Assert.AreEqual(@"static extern void g_byte_array_append PARAMS
Assert.AreEqual (@"static extern void g_byte_array_append PARAMS

///<summary>
/// Adds the given bytes to the end of the #GByteArray.
Expand Down
15 changes: 7 additions & 8 deletions src/Gir.Tests/GenerationOptionsTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Linq;


using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -8,11 +7,11 @@ namespace Gir.Tests
public class GenerationOptionsTests : GenerationTestBase
{
[Test]
public void GenerateDocumentationWhenCompatFalse()
public void GenerateDocumentationWhenCompatFalse ()
{
var result = GenerateType(Pango, "Alignment");
var result = GenerateType (Pango, "Alignment");

Assert.AreEqual(@"namespace Pango
Assert.AreEqual (@"namespace Pango
{
///<summary>
/// A #PangoAlignment describes how to align the lines of a #PangoLayout within the
Expand All @@ -35,11 +34,11 @@ public enum Alignment
}

[Test]
public void GenerateNoDocumentationWhenCompatTrue()
public void GenerateNoDocumentationWhenCompatTrue ()
{
var result = GenerateType(Pango, "Alignment", compat: true);
var result = GenerateType (Pango, "Alignment", compat: true);

Assert.AreEqual(@"namespace Pango
Assert.AreEqual (@"namespace Pango
{
public enum Alignment
{
Expand Down
63 changes: 32 additions & 31 deletions src/Gir.Tests/GenerationTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using System.Reflection;
using System.Text;

using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -20,88 +21,88 @@ public abstract class GenerationTestBase

static IEnumerable<Stream> GetResourceStreams (string name = null)
{
var assembly = Assembly.GetExecutingAssembly();
var assembly = Assembly.GetExecutingAssembly ();

var names = assembly.GetManifestResourceNames();
var names = assembly.GetManifestResourceNames ();
foreach (var resName in names) {
if (string.IsNullOrEmpty (resName) || resName.EndsWith(name + ".gir", StringComparison.OrdinalIgnoreCase))
yield return assembly.GetManifestResourceStream(resName);
if (string.IsNullOrEmpty (resName) || resName.EndsWith (name + ".gir", StringComparison.OrdinalIgnoreCase))
yield return assembly.GetManifestResourceStream (resName);
}
}

static string GetIncludeDirectory ()
{
return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestFiles");
return Path.Combine (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location), "TestFiles");
}

static protected IEnumerable<Tuple<Repository, IEnumerable<Repository>>> ParseAllGirFiles()
static protected IEnumerable<Tuple<Repository, IEnumerable<Repository>>> ParseAllGirFiles ()
{
foreach (var stream in GetResourceStreams()) {
foreach (var stream in GetResourceStreams ()) {
var repos = ParseGirStream (stream, out Repository mainRepository);
yield return new Tuple<Repository, IEnumerable<Repository>>(mainRepository, repos);

yield return new Tuple<Repository, IEnumerable<Repository>> (mainRepository, repos);
}
}

static protected Stream GetGIRFile (string name)
{
return GetResourceStreams(name).Single();
return GetResourceStreams (name).Single ();
}

static protected IEnumerable<Repository> ParseGirFile (string name, out Repository mainRepository)
{
return ParseGirStream(GetGIRFile(name), out mainRepository);
return ParseGirStream (GetGIRFile (name), out mainRepository);
}

static protected IEnumerable<Repository> ParseGirStream (Stream gir, out Repository mainRepository)
{
return Parser.Parse(gir, GetIncludeDirectory(), out mainRepository);
return Parser.Parse (gir, GetIncludeDirectory (), out mainRepository);
}


protected static string GetGenerationResult(GenerationOptions opts)
protected static string GetGenerationResult (GenerationOptions opts)
{
var ms = (MemoryStream)opts.RedirectStream;
return Encoding.UTF8.GetString(ms.ToArray());
return Encoding.UTF8.GetString (ms.ToArray ());
}

protected static GenerationOptions GetOptions(IEnumerable<Repository> repositories, Repository mainRepository, bool compat = false)
protected static GenerationOptions GetOptions (IEnumerable<Repository> repositories, Repository mainRepository, bool compat = false)
{
return new GenerationOptions("", repositories, mainRepository, compat, new MemoryStream ());
return new GenerationOptions ("", repositories, mainRepository, compat, new MemoryStream ());
}

protected static void GenerateType (Repository repo, GenerationOptions opts, string typeName)
{
repo.GetGeneratables().First(x => x.Name == typeName).Generate(opts);
repo.GetGeneratables ().First (x => x.Name == typeName).Generate (opts);
}

protected static void GenerateMember(Repository repo, GenerationOptions opts, string typeName, string memberName)
protected static void GenerateMember (Repository repo, GenerationOptions opts, string typeName, string memberName)
{
var type = repo.GetGeneratables().First(x => x.Name == typeName);
var type = repo.GetGeneratables ().First (x => x.Name == typeName);

using (var writer = type.GetWriter(opts)) {
type.GenerateMembers(writer, x => x.Name == memberName);
using (var writer = type.GetWriter (opts)) {
type.GenerateMembers (writer, x => x.Name == memberName);
}
}

protected static string GenerateType (string girFile, string typeName, bool compat = false)
{
var repositories = ParseGirFile(girFile, out var mainRepository);
var opts = GetOptions(repositories, mainRepository, compat);
GenerateType(mainRepository, opts, typeName);
var repositories = ParseGirFile (girFile, out var mainRepository);
var opts = GetOptions (repositories, mainRepository, compat);

GenerateType (mainRepository, opts, typeName);

return GetGenerationResult(opts);
return GetGenerationResult (opts);
}

protected static string GenerateMember(string girFile, string typeName, string memberName, bool compat = false)
protected static string GenerateMember (string girFile, string typeName, string memberName, bool compat = false)
{
var repositories = ParseGirFile(girFile, out var mainRepository);
var opts = GetOptions(repositories, mainRepository, compat);
var repositories = ParseGirFile (girFile, out var mainRepository);
var opts = GetOptions (repositories, mainRepository, compat);

GenerateMember(mainRepository, opts, typeName, memberName);
GenerateMember (mainRepository, opts, typeName, memberName);

return GetGenerationResult(opts);
return GetGenerationResult (opts);
}
}
}
9 changes: 4 additions & 5 deletions src/Gir.Tests/InterfaceTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;


using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -8,13 +7,13 @@ namespace Gir.Tests
public class InterfaceTests : GenerationTestBase
{
[Test]
public void TestClassIsGenerated()
public void TestClassIsGenerated ()
{
// Test is incomplete, as record is not fully generated atm.
var result = GenerateType(Gio2, "Seekable");
var result = GenerateType (Gio2, "Seekable");

// Need to map pointers at symbol level.
Assert.AreEqual(@"namespace Gio
Assert.AreEqual (@"namespace Gio
{
///<summary>
/// #GSeekable is implemented by streams (implementations of
Expand Down
12 changes: 6 additions & 6 deletions src/Gir.Tests/RecordTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;

using NUnit.Framework;

namespace Gir.Tests
Expand All @@ -7,14 +7,14 @@ namespace Gir.Tests
public class RecordTests : GenerationTestBase
{
[Test]
public void TestRecordIsGenerated()
public void TestRecordIsGenerated ()
{
// Test is incomplete, as record is not fully generated atm.
var result = GenerateType(GLib, "ByteArray");
var result = GenerateType (GLib, "ByteArray");


// Need to map pointers at symbol level.
Assert.AreEqual(@"namespace GLib
Assert.AreEqual (@"namespace GLib
{
///<summary>Contains the public fields of a GByteArray.</summary>
public struct ByteArray
Expand Down Expand Up @@ -191,11 +191,11 @@ static void Unref PARAMS
public void CanGenerateActionIfaceRecord ()
{
// Test is incomplete, as record is not fully generated atm.
var result = GenerateType(Atk1, "ActionIface");
var result = GenerateType (Atk1, "ActionIface");


// Need to map pointers at symbol level.
Assert.AreEqual(@"namespace Atk
Assert.AreEqual (@"namespace Atk
{
}", result);
}
Expand Down
Loading