Skip to content
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ end_of_line = lf
# ---

# ---
# langugage conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#language-conventions
# language conventions https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference#language-conventions

# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
Expand Down
10 changes: 5 additions & 5 deletions build/build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Target "BuildApp" (fun _ ->
("Configuration","Release");
]

//Compile each csproj and output it seperately in build/output/PROJECTNAME
//Compile each csproj and output it separately in build/output/PROJECTNAME
!! "src/**/*.csproj"
|> Seq.map(fun f -> (f, buildDir + directoryInfo(f).Name.Replace(".csproj", "")))
|> Seq.iter(fun (f,d) -> MSBuild d "Build" msbuildProperties (seq { yield f }) |> ignore)
Expand Down Expand Up @@ -110,11 +110,11 @@ let validateSignedAssembly = fun name ->
let token = (tokenMessage.Replace("Public key token is", "")).Trim();

let valid = (out.ExitCode, token)
let oficialToken = "fe6ce3ea283749f2"
let officialToken = "fe6ce3ea283749f2"
match valid with
| (0, t) when t = oficialToken ->
| (0, t) when t = officialToken ->
trace (sprintf "%s was signed with official key token %s" name t)
| (_, t) -> traceFAKE "%s was not signed with the official token: %s but %s" name oficialToken t
| (_, t) -> traceFAKE "%s was not signed with the official token: %s but %s" name officialToken t

let nugetPack = fun _ ->
let package = @"build\nuget.nuspec"
Expand Down Expand Up @@ -176,7 +176,7 @@ let getAssemblyVersion = (fun _ ->

match (assemblySuffix, version.Minor, version.Patch) with
| (s, m, p) when s <> "" && s <> "ci" && (m <> 0 || p <> 0) -> failwithf "Cannot create prereleases for minor or major builds!"
| ("", _, _) -> traceFAKE "Building fileversion %s for asssembly version %s" fileVersion assemblyVersion
| ("", _, _) -> traceFAKE "Building file version %s for assembly version %s" fileVersion assemblyVersion
| _ -> traceFAKE "Building prerelease %s for major assembly version %s " fileVersion assemblyVersion

assemblyVersion
Expand Down
4 changes: 2 additions & 2 deletions build/chocolatey.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>0.12.1</version>
<authors>EditorConfig Team</authors>
<owners>Hong Xu, Martijn Laarman</owners>
<summary>Editorconig commandline tooling written in .NET</summary>
<description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readibly and they work nicely with version control systems. This package installs the editorconfig command line tooling written in .NET.</description>
<summary>EditorConfig commandline tooling written in .NET</summary>
<description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readable and they work nicely with version control systems. This package installs the editorconfig command line tooling written in .NET.</description>
<projectUrl>https://editorconfig.org</projectUrl>
<tags>development editor IDE coding-style</tags>
<licenseUrl>https://raw.github.com/editorconfig/editorconfig-core/master/LICENSE</licenseUrl>
Expand Down
2 changes: 1 addition & 1 deletion build/nuget.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<authors>EditorConfig Team</authors>
<owners>Martijn Laarman</owners>
<summary>The Core Library of EditorConfig ported to .NET</summary>
<description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readibly and they work nicely with version control systems. This is the core library of EditorConfig written ported to .NET.</description>
<description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readable and they work nicely with version control systems. This is the core library of EditorConfig written ported to .NET.</description>
<projectUrl>https://editorconfig.org</projectUrl>
<tags>development editor IDE coding-style</tags>
<licenseUrl>https://raw.github.com/editorconfig/editorconfig-core/master/LICENSE</licenseUrl>
Expand Down
4 changes: 2 additions & 2 deletions src/EditorConfig.App/ArgumentsParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal class ArgumentsParser
public ArgumentsParser(string[] args)
{
if (args.Length == 0)
throw new ApplicationArgumentException("Must specify atleast one FILEPATH");
throw new ApplicationArgumentException("Must specify at least one FILEPATH");

while (args.Length > 0 && args[0].StartsWith("-"))
{
Expand Down Expand Up @@ -50,7 +50,7 @@ public ArgumentsParser(string[] args)
}
}
if (args.Length == 0)
throw new ApplicationArgumentException("You need to specify atleast one file");
throw new ApplicationArgumentException("You need to specify at least one file");

FileNames = args;
}
Expand Down
2 changes: 1 addition & 1 deletion src/EditorConfig.Core/Charset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public enum Charset
Latin1,
UTF8,
/// <summary>
/// Usage of UFT8BOM is discouraged
/// Usage of UTF8BOM is discouraged
/// </summary>
UTF8BOM,
UTF16BE,
Expand Down
2 changes: 1 addition & 1 deletion src/EditorConfig.Core/EditorConfig.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
<PackageId>editorconfig</PackageId>
<Description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readibly and they work nicely with version control systems. This is the core library of EditorConfig written ported to .NET.</Description>
<Description>EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs. The EditorConfig project consists of a file format for defining coding styles and a collection of text editor plugins that enable editors to read the file format and adhere to defined styles. EditorConfig files are easily readable and they work nicely with version control systems. This is the core library of EditorConfig written ported to .NET.</Description>
<PackageTags>development editor IDE coding-style editorconfig</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorConfig.Core/EditorConfigFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public interface IEditorConfigFile
/// <summary> A hint this instance of <see cref="EditorConfigFile"/> was cached</summary>
public string CacheKey { get; }

/// <summary> Indicates wheter the loaded editorconfig represents the root of the chain </summary>
/// <summary> Indicates whether the loaded editorconfig represents the root of the chain </summary>
public bool IsRoot { get; }
}

Expand Down
2 changes: 1 addition & 1 deletion src/EditorConfig.Core/EditorConfigWorkspace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace EditorConfig.Core
{
/// <summary>
/// Not ready yet the idea is to create a class that you can load and reuse in a long running process.
/// This allows you to reuse parsed <see cref="EditorConfigFile"/> instances without performing an IO call everytime
/// This allows you to reuse parsed <see cref="EditorConfigFile"/> instances without performing an IO call every time
/// <see cref="EditorConfigParser.Parse(string[])"/> is called.
///
/// Will need to store all paths in a prefix tree to filter to relevant editorconfig files to apply to a given path
Expand Down
8 changes: 4 additions & 4 deletions src/EditorConfig.Core/Minimatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public class GlobMatcherOptions
///<summary>If set, then patterns without slashes will be matched against the basename of the path if it contains slashes. For example, <c>a?b</c> would match the path <c>/xyz/123/acb</c>, but not <c>/xyz/acb/123</c>.</summary>
public bool MatchBase { get; set; }

///<summary>If true, backslahes in paths will be treated as forward slashes.</summary>
///<summary>If true, backslashes in paths will be treated as forward slashes.</summary>
public bool AllowWindowsPaths { get; set; }

///<summary>If true, backslahes in patterns will be treated as forward slashes. This disables escape characters.</summary>
///<summary>If true, backslashes in patterns will be treated as forward slashes. This disables escape characters.</summary>
public bool AllowWindowsPathsInPatterns { get; set; }
}

Expand Down Expand Up @@ -481,7 +481,7 @@ private bool CheckMatchedByAsterisk(Asterisk asteriskItem, bool first, int oldSt

private bool CheckDot(int dotPos)
{
// .x should not match neither *x, nor **x, nor ?x, unless
// .x should match neither *x, nor **x, nor ?x, unless
// myOptions.Dot is set.
// . and .. are *never* matched by *, ** or ?, for explosively
// exponential reasons.
Expand Down Expand Up @@ -780,7 +780,7 @@ private static IList<string> BraceExpand(string pattern, GlobMatcherOptions opti
// {b,c{d,e},{f,g}h}x{y,z}
// walk through the set, expanding each part, until
// the set ends. then, we'll expand the suffix.
// If the set only has a single member, then'll put the {} back
// If the set only has a single member, then we'll put the {} back

// first, handle numeric sets, since they're easier
var numset = ourNumericSet.Match(pattern);
Expand Down
2 changes: 1 addition & 1 deletion src/EditorConfig.Tests/TabWidths/TabWidthTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void NegativeNumber()
}

[Test]
public void TabIndenSizeAndSpecifiedTabWidth()
public void TabIndentSizeAndSpecifiedTabWidth()
{
var file = GetConfig(MethodBase.GetCurrentMethod(), "f.x", ".tab.editorconfig");
file.TabWidth.Should().HaveValue();
Expand Down
Loading