diff --git a/.editorconfig b/.editorconfig index 7696baf..18c20b8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/build/build.fsx b/build/build.fsx index f46f20a..e8e330f 100644 --- a/build/build.fsx +++ b/build/build.fsx @@ -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) @@ -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" @@ -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 diff --git a/build/chocolatey.nuspec b/build/chocolatey.nuspec index fd688e4..0e3fd6b 100644 --- a/build/chocolatey.nuspec +++ b/build/chocolatey.nuspec @@ -6,8 +6,8 @@ 0.12.1 EditorConfig Team Hong Xu, Martijn Laarman - Editorconig commandline tooling written in .NET - 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. + EditorConfig commandline tooling written in .NET + 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. https://editorconfig.org development editor IDE coding-style https://raw.github.com/editorconfig/editorconfig-core/master/LICENSE diff --git a/build/nuget.nuspec b/build/nuget.nuspec index 53a181a..ebf1b8d 100644 --- a/build/nuget.nuspec +++ b/build/nuget.nuspec @@ -7,7 +7,7 @@ EditorConfig Team Martijn Laarman The Core Library of EditorConfig ported to .NET - 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. + 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. https://editorconfig.org development editor IDE coding-style https://raw.github.com/editorconfig/editorconfig-core/master/LICENSE diff --git a/src/EditorConfig.App/ArgumentsParser.cs b/src/EditorConfig.App/ArgumentsParser.cs index 5cdf69d..eb2e85d 100644 --- a/src/EditorConfig.App/ArgumentsParser.cs +++ b/src/EditorConfig.App/ArgumentsParser.cs @@ -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("-")) { @@ -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; } diff --git a/src/EditorConfig.Core/Charset.cs b/src/EditorConfig.Core/Charset.cs index 1ce2694..9c6841e 100644 --- a/src/EditorConfig.Core/Charset.cs +++ b/src/EditorConfig.Core/Charset.cs @@ -9,7 +9,7 @@ public enum Charset Latin1, UTF8, /// - /// Usage of UFT8BOM is discouraged + /// Usage of UTF8BOM is discouraged /// UTF8BOM, UTF16BE, diff --git a/src/EditorConfig.Core/EditorConfig.Core.csproj b/src/EditorConfig.Core/EditorConfig.Core.csproj index 1522205..891db63 100644 --- a/src/EditorConfig.Core/EditorConfig.Core.csproj +++ b/src/EditorConfig.Core/EditorConfig.Core.csproj @@ -3,7 +3,7 @@ net45;netstandard1.3;netstandard2.0 editorconfig - 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. + 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. development editor IDE coding-style editorconfig true true diff --git a/src/EditorConfig.Core/EditorConfigFile.cs b/src/EditorConfig.Core/EditorConfigFile.cs index ad48d2d..6214c09 100644 --- a/src/EditorConfig.Core/EditorConfigFile.cs +++ b/src/EditorConfig.Core/EditorConfigFile.cs @@ -18,7 +18,7 @@ public interface IEditorConfigFile /// A hint this instance of was cached public string CacheKey { get; } - /// Indicates wheter the loaded editorconfig represents the root of the chain + /// Indicates whether the loaded editorconfig represents the root of the chain public bool IsRoot { get; } } diff --git a/src/EditorConfig.Core/EditorConfigWorkspace.cs b/src/EditorConfig.Core/EditorConfigWorkspace.cs index 2e5a5b0..32b1d53 100644 --- a/src/EditorConfig.Core/EditorConfigWorkspace.cs +++ b/src/EditorConfig.Core/EditorConfigWorkspace.cs @@ -7,7 +7,7 @@ namespace EditorConfig.Core { /// /// 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 instances without performing an IO call everytime + /// This allows you to reuse parsed instances without performing an IO call every time /// is called. /// /// Will need to store all paths in a prefix tree to filter to relevant editorconfig files to apply to a given path diff --git a/src/EditorConfig.Core/Minimatcher.cs b/src/EditorConfig.Core/Minimatcher.cs index 5f19697..5e62566 100644 --- a/src/EditorConfig.Core/Minimatcher.cs +++ b/src/EditorConfig.Core/Minimatcher.cs @@ -47,10 +47,10 @@ public class GlobMatcherOptions ///If set, then patterns without slashes will be matched against the basename of the path if it contains slashes. For example, a?b would match the path /xyz/123/acb, but not /xyz/acb/123. public bool MatchBase { get; set; } - ///If true, backslahes in paths will be treated as forward slashes. + ///If true, backslashes in paths will be treated as forward slashes. public bool AllowWindowsPaths { get; set; } - ///If true, backslahes in patterns will be treated as forward slashes. This disables escape characters. + ///If true, backslashes in patterns will be treated as forward slashes. This disables escape characters. public bool AllowWindowsPathsInPatterns { get; set; } } @@ -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. @@ -780,7 +780,7 @@ private static IList 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); diff --git a/src/EditorConfig.Tests/TabWidths/TabWidthTests.cs b/src/EditorConfig.Tests/TabWidths/TabWidthTests.cs index 01b4cb1..c25510e 100644 --- a/src/EditorConfig.Tests/TabWidths/TabWidthTests.cs +++ b/src/EditorConfig.Tests/TabWidths/TabWidthTests.cs @@ -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();