From cced78c7d5d4a3700eb6865469df30b87a650b2f Mon Sep 17 00:00:00 2001 From: Aleksey Martynov Date: Wed, 10 May 2017 15:31:22 +0300 Subject: [PATCH 1/3] editorconfig + lint --- .editorconfig | 16 ++++++++++++++++ appveyor.yml | 1 + package.json | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..a2d6365a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 4 + +[*.md] +trim_trailing_whitespace = false + +[*.{json,yml,csproj,config,Config}] +indent_size = 2 + +[*.cs] +csharp_new_line_before_open_brace = none diff --git a/appveyor.yml b/appveyor.yml index b27be95c..1ee604c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,7 @@ build_script: - dotnet build net\DevExtreme.AspNet.Data.sln test_script: + - npm run eclint-check - npm test - >- diff --git a/package.json b/package.json index 7d2f2ee6..2e6073d2 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "devDependencies": { "@types/jquery": "^2.0.39", + "eclint": "^2.0.1", "jquery": "^2.2.4", "jquery-mockjax": "^2.2.1", "jshint": "^2.9.2", @@ -31,6 +32,7 @@ "webpack": "^1.14.0" }, "scripts": { + "eclint-check": "eclint check ** !.git/** !**/{node_modules,bin,obj}/** !**/*.sln !js-test/test-bundle.js", "pretest": "webpack --config js-test/test-bundle-webpack-config.js", "test": "jshint --verbose js && karma start js-test/karma.js && karma start js-test/karma.js --bundled && tsc js-test/check-ts-compilation" } From 8f63d877cf9db43c71f3b6fdad1461d7a50a2924 Mon Sep 17 00:00:00 2001 From: Aleksey Martynov Date: Wed, 10 May 2017 15:56:43 +0300 Subject: [PATCH 2/3] whitelist strategy --- .editorconfig | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index a2d6365a..7a99f8d3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,7 @@ indent_size = 4 [*.md] trim_trailing_whitespace = false -[*.{json,yml,csproj,config,Config}] +[*.{json,yml}] indent_size = 2 [*.cs] diff --git a/package.json b/package.json index 2e6073d2..d5ca193a 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "webpack": "^1.14.0" }, "scripts": { - "eclint-check": "eclint check ** !.git/** !**/{node_modules,bin,obj}/** !**/*.sln !js-test/test-bundle.js", + "eclint-check": "eclint check *.{yml,json} {net,js,js-test}/**/*.{cs,js,ts,html,json,cshtml} !net/**/{bin,obj}/** !js-test/test-bundle.js", "pretest": "webpack --config js-test/test-bundle-webpack-config.js", "test": "jshint --verbose js && karma start js-test/karma.js && karma start js-test/karma.js --bundled && tsc js-test/check-ts-compilation" } From f940e403dd7bc42a8dae12079a6ed495862650b6 Mon Sep 17 00:00:00 2001 From: Aleksey Martynov Date: Wed, 10 May 2017 16:09:19 +0300 Subject: [PATCH 3/3] fixes --- appveyor.yml | 2 +- js-test/test-deps.js | 2 +- js-test/test.html | 4 ++-- js-test/test.js | 2 +- js/dx.aspnet.data.js | 4 ++-- .../AggregateCalculatorTests.cs | 10 +++++----- net/DevExtreme.AspNet.Data.Tests/AnonTypeTests.cs | 4 ++-- .../DataSourceExpressionBuilderTests.cs | 6 +++--- .../DataSourceLoaderTests.cs | 4 ++-- .../ExpressionCompilerTests.cs | 4 ++-- .../RemoteGroupingTests.cs | 8 ++++---- net/DevExtreme.AspNet.Data.Tests/UtilsTests.cs | 2 +- .../Aggregation/AggregateCalculator.cs | 4 ++-- .../Aggregation/AvgAggregator.cs | 2 +- .../Aggregation/CountAggregator.cs | 2 +- .../Aggregation/MaxAggregator.cs | 2 +- .../Aggregation/MinAggregator.cs | 2 +- .../Aggregation/SumAggregator.cs | 2 +- net/DevExtreme.AspNet.Data/AssemblyInfo.cs | 2 +- net/DevExtreme.AspNet.Data/DataSourceLoader.cs | 2 +- net/DevExtreme.AspNet.Data/DefaultAccessor.cs | 2 +- net/DevExtreme.AspNet.Data/ExpressionCompiler.cs | 4 ++-- .../FilterExpressionCompiler.cs | 4 ++-- net/DevExtreme.AspNet.Data/NET40.cs | 4 ++-- net/DevExtreme.AspNet.Data/QueryableOnce.cs | 2 +- .../RemoteGrouping/RemoteCountAggregator.cs | 2 +- .../RemoteGrouping/RemoteGroupExpressionCompiler.cs | 12 ++++++------ .../RemoteGrouping/RemoteGroupTypeMarkup.cs | 4 ++-- net/DevExtreme.AspNet.Data/SortExpressionCompiler.cs | 2 +- .../Types/AnonType.Generated.cs | 1 - .../Types/AnonType.Generated.tt | 4 ++-- net/DevExtreme.AspNet.Data/Utils.cs | 2 +- net/Sample/Controllers/NorthwindController.cs | 2 +- net/Sample/Models/NorthwindContext.cs | 2 +- net/Sample/Properties/launchSettings.json | 2 +- net/Sample/gulpfile.js | 2 +- package.json | 2 +- 37 files changed, 61 insertions(+), 62 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1ee604c0..28b0ff3b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,4 +46,4 @@ on_success: artifacts: - path: net\DevExtreme.AspNet.Data\bin\Release\*.nupkg - - path: devextreme-aspnet-data-*.tgz + - path: devextreme-aspnet-data-*.tgz diff --git a/js-test/test-deps.js b/js-test/test-deps.js index 6b17cc58..b4475aab 100644 --- a/js-test/test-deps.js +++ b/js-test/test-deps.js @@ -6,4 +6,4 @@ var TEST_DEPS = [ ]; if(typeof module !== "undefined") - module.exports = TEST_DEPS; \ No newline at end of file + module.exports = TEST_DEPS; diff --git a/js-test/test.html b/js-test/test.html index df2743ff..95bccc89 100644 --- a/js-test/test.html +++ b/js-test/test.html @@ -2,7 +2,7 @@ @@ -10,4 +10,4 @@
- \ No newline at end of file + diff --git a/js-test/test.js b/js-test/test.js index 202defdf..78274356 100644 --- a/js-test/test.js +++ b/js-test/test.js @@ -303,7 +303,7 @@ loadUrl: "/load", loadParams: { custom: 123 }, onBeforeSend: function(op, ajax) { - assert.equal(op, "load"); + assert.equal(op, "load"); assert.deepEqual(ajax.data, { custom: 123 }); done(); } diff --git a/js/dx.aspnet.data.js b/js/dx.aspnet.data.js index dee302f0..8774f46f 100644 --- a/js/dx.aspnet.data.js +++ b/js/dx.aspnet.data.js @@ -201,7 +201,7 @@ return JSON.stringify(key); return key; - } + } function serializeDate(date) { @@ -219,7 +219,7 @@ f = date.getMilliseconds(); if(h + m + s + f > 0) - builder.push(" ", zpad(h, 2), ":", zpad(m, 2), ":", zpad(s, 2), ".", zpad(f, 3)); + builder.push(" ", zpad(h, 2), ":", zpad(m, 2), ":", zpad(s, 2), ".", zpad(f, 3)); return builder.join(""); } diff --git a/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs b/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs index de489af4..79bc3d9e 100644 --- a/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs @@ -47,11 +47,11 @@ SQL script to validate #insert into t1 (a) values (null); select concat( - " sum=", coalesce(sum(a), 'N'), - " min=", coalesce(min(a), 'N'), - " max=", coalesce(max(a), 'N'), - " avg=", coalesce(avg(a), 'N'), - " count=", coalesce(count(*), 'N') + " sum=", coalesce(sum(a), 'N'), + " min=", coalesce(min(a), 'N'), + " max=", coalesce(max(a), 'N'), + " avg=", coalesce(avg(a), 'N'), + " count=", coalesce(count(*), 'N') ) from t1; */ diff --git a/net/DevExtreme.AspNet.Data.Tests/AnonTypeTests.cs b/net/DevExtreme.AspNet.Data.Tests/AnonTypeTests.cs index 825bc2c6..830ec5e7 100644 --- a/net/DevExtreme.AspNet.Data.Tests/AnonTypeTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/AnonTypeTests.cs @@ -12,7 +12,7 @@ public class AnonTypeTests { [Fact] public void Get() { Assert.Same( - typeof(AnonType), + typeof(AnonType), AnonType.Get(new Type[0]) ); @@ -29,7 +29,7 @@ public void Get() { var x = Record.Exception(delegate { AnonType.Get(Enumerable.Repeat(typeof(int), 100).ToArray()); }); - Assert.Contains("Too many", x.Message); + Assert.Contains("Too many", x.Message); } [Fact] diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceExpressionBuilderTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceExpressionBuilderTests.cs index 89600e61..6129a24c 100644 --- a/net/DevExtreme.AspNet.Data.Tests/DataSourceExpressionBuilderTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/DataSourceExpressionBuilderTests.cs @@ -127,7 +127,7 @@ public void GuardNulls() { Filter = new[] { new[] { "Item1", ">", "0" }, new[] { "Item2", "contains", "z" }, - new[] { "Item2.Length", ">", "1" }, + new[] { "Item2.Length", ">", "1" }, new[] { "Item3.Year", ">", "0" } }, Sort = new[] { @@ -146,11 +146,11 @@ public void GuardNulls() { Tuple.Create(null, "zz", new DateTime(2000, 1, 1)), Tuple.Create(1, null, new DateTime(2000, 1, 1)), Tuple.Create(1, "zz", null), - + // kept Tuple.Create(1, "zz", new DateTime(2000, 1, 2)), - Tuple.Create(1, "zz", new DateTime(2000, 1, 1)) + Tuple.Create(1, "zz", new DateTime(2000, 1, 1)) }; var result = query(data.AsQueryable()).ToArray(); diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs index 33a30efe..2dc1b0ea 100644 --- a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs @@ -135,7 +135,7 @@ public void Load_TotalSummary() { new SummaryInfo { Selector = "this", SummaryType = "min" }, new SummaryInfo { Selector = "this", SummaryType = "max" } } - }); + }); Assert.Equal(1, result.summary[0]); Assert.Equal(3, result.summary[1]); @@ -157,7 +157,7 @@ public void Load_GroupSummary() { GroupSummary = new[] { new SummaryInfo { Selector = "value", SummaryType = "sum" } } - }); + }); Assert.Equal(3M, result[0].summary[0]); Assert.Equal(30M, result[1].summary[0]); diff --git a/net/DevExtreme.AspNet.Data.Tests/ExpressionCompilerTests.cs b/net/DevExtreme.AspNet.Data.Tests/ExpressionCompilerTests.cs index b9db5c64..2fcc1f7d 100644 --- a/net/DevExtreme.AspNet.Data.Tests/ExpressionCompilerTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/ExpressionCompilerTests.cs @@ -11,7 +11,7 @@ public class ExpressionCompilerTests { class SampleCompiler : ExpressionCompiler { - public SampleCompiler(bool guardNulls) + public SampleCompiler(bool guardNulls) : base(guardNulls) { } @@ -92,7 +92,7 @@ public void Accessor_ForceToString() { Assert.Equal("t.Ref.ToString()", CompileAccessor(false, "Ref", true)); Assert.Equal( - "IIF((t == null), null, t.String)", + "IIF((t == null), null, t.String)", CompileAccessor(true, "String", true) ); diff --git a/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs b/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs index a53f0a26..2d26683e 100644 --- a/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs @@ -70,7 +70,7 @@ public void GroupingAndSummary() { TotalSummary = new[] { new SummaryInfo { SummaryType = "count" }, new SummaryInfo { Selector = "B", SummaryType = "sum" }, - new SummaryInfo { Selector = "B", SummaryType = "avg" }, + new SummaryInfo { Selector = "B", SummaryType = "avg" }, } }; @@ -105,9 +105,9 @@ public void GroupingAndSummary() { Assert.Equal(new object[] { 3, 15M, 5M }, g2.summary); Assert.Equal(new object[] { 2, 9M, 4.5M }, g21.summary); Assert.Equal(new object[] { 1, 6M, 6M }, g22.summary); - + Assert.Equal(2, g11.count); - Assert.Equal(1, g12.count); + Assert.Equal(1, g12.count); Assert.Equal(2, g21.count); Assert.Equal(1, g22.count); @@ -225,7 +225,7 @@ public void RequireGroupCount() { }; var result = (DataSourceLoadResult)DataSourceLoader.Load(data, loadOptions); - + Assert.Equal(4, result.totalCount); var groups = result.data.Cast().ToArray(); diff --git a/net/DevExtreme.AspNet.Data.Tests/UtilsTests.cs b/net/DevExtreme.AspNet.Data.Tests/UtilsTests.cs index dcef6306..620066e0 100644 --- a/net/DevExtreme.AspNet.Data.Tests/UtilsTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/UtilsTests.cs @@ -32,7 +32,7 @@ public void AddRequiredSort_Desc() { } }; var requiredSelectors = new[] { "R1", "R2" }; - + var ensuredSort = Utils.AddRequiredSort(initalSort, requiredSelectors).ToArray(); Assert.False(ensuredSort[1].Desc); Assert.False(ensuredSort[2].Desc); diff --git a/net/DevExtreme.AspNet.Data/Aggregation/AggregateCalculator.cs b/net/DevExtreme.AspNet.Data/Aggregation/AggregateCalculator.cs index 753f8089..4500f6b5 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/AggregateCalculator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/AggregateCalculator.cs @@ -63,12 +63,12 @@ void ProcessItem(object item) { void ProcessGroup(Group group) { if(_groupAggregatorsStack != null) _groupAggregatorsStack.Push(_groupSummaryTypes.Select(CreateAggregator).ToArray()); - + foreach(var i in group.items) ProcessItem(i); if(_groupAggregatorsStack != null) - group.summary = Finish(_groupAggregatorsStack.Pop()); + group.summary = Finish(_groupAggregatorsStack.Pop()); } void Step(object obj, Aggregator[] aggregators, string[] selectors) { diff --git a/net/DevExtreme.AspNet.Data/Aggregation/AvgAggregator.cs b/net/DevExtreme.AspNet.Data/Aggregation/AvgAggregator.cs index eb8ad237..34a5cb4d 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/AvgAggregator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/AvgAggregator.cs @@ -9,7 +9,7 @@ class AvgAggregator : Aggregator { Aggregator _counter; SumAggregator _summator; - public AvgAggregator(IAccessor accessor, Aggregator counter) + public AvgAggregator(IAccessor accessor, Aggregator counter) : base(accessor) { _counter = counter; _summator = new SumAggregator(accessor); diff --git a/net/DevExtreme.AspNet.Data/Aggregation/CountAggregator.cs b/net/DevExtreme.AspNet.Data/Aggregation/CountAggregator.cs index 92d3ff74..45d3c8bc 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/CountAggregator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/CountAggregator.cs @@ -9,7 +9,7 @@ class CountAggregator : Aggregator { int _count; bool _skipNulls; - public CountAggregator(IAccessor accessor, bool skipNulls) + public CountAggregator(IAccessor accessor, bool skipNulls) : base(accessor) { _skipNulls = skipNulls; } diff --git a/net/DevExtreme.AspNet.Data/Aggregation/MaxAggregator.cs b/net/DevExtreme.AspNet.Data/Aggregation/MaxAggregator.cs index c19441a2..3d422923 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/MaxAggregator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/MaxAggregator.cs @@ -8,7 +8,7 @@ namespace DevExtreme.AspNet.Data.Aggregation { class MaxAggregator : Aggregator { object _max = null; - public MaxAggregator(IAccessor accessor) + public MaxAggregator(IAccessor accessor) : base(accessor) { } diff --git a/net/DevExtreme.AspNet.Data/Aggregation/MinAggregator.cs b/net/DevExtreme.AspNet.Data/Aggregation/MinAggregator.cs index a5d4e45d..ed5d7c50 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/MinAggregator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/MinAggregator.cs @@ -8,7 +8,7 @@ namespace DevExtreme.AspNet.Data.Aggregation { class MinAggregator : Aggregator { object _min = null; - public MinAggregator(IAccessor accessor) + public MinAggregator(IAccessor accessor) : base(accessor) { } diff --git a/net/DevExtreme.AspNet.Data/Aggregation/SumAggregator.cs b/net/DevExtreme.AspNet.Data/Aggregation/SumAggregator.cs index 643e6b98..6ee31c4c 100644 --- a/net/DevExtreme.AspNet.Data/Aggregation/SumAggregator.cs +++ b/net/DevExtreme.AspNet.Data/Aggregation/SumAggregator.cs @@ -9,7 +9,7 @@ namespace DevExtreme.AspNet.Data.Aggregation { class SumAggregator : Aggregator { decimal? _sum; - public SumAggregator(IAccessor accessor) + public SumAggregator(IAccessor accessor) : base(accessor) { } diff --git a/net/DevExtreme.AspNet.Data/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data/AssemblyInfo.cs index d279f649..a0ff052d 100644 --- a/net/DevExtreme.AspNet.Data/AssemblyInfo.cs +++ b/net/DevExtreme.AspNet.Data/AssemblyInfo.cs @@ -10,4 +10,4 @@ #if !DEBUG [assembly: AssemblyKeyFile("release.snk")] -#endif \ No newline at end of file +#endif diff --git a/net/DevExtreme.AspNet.Data/DataSourceLoader.cs b/net/DevExtreme.AspNet.Data/DataSourceLoader.cs index 0b97df62..ac8c4dbb 100644 --- a/net/DevExtreme.AspNet.Data/DataSourceLoader.cs +++ b/net/DevExtreme.AspNet.Data/DataSourceLoader.cs @@ -103,7 +103,7 @@ static IQueryable ExecQuery(Func, IQueryable> query, I result = new QueryableOnce(result); if(options.ExpressionWatcher != null) - options.ExpressionWatcher(result.Expression); + options.ExpressionWatcher(result.Expression); #endif return result; diff --git a/net/DevExtreme.AspNet.Data/DefaultAccessor.cs b/net/DevExtreme.AspNet.Data/DefaultAccessor.cs index 49b10d57..bac5c9d1 100644 --- a/net/DevExtreme.AspNet.Data/DefaultAccessor.cs +++ b/net/DevExtreme.AspNet.Data/DefaultAccessor.cs @@ -9,7 +9,7 @@ namespace DevExtreme.AspNet.Data { class DefaultAccessor : ExpressionCompiler, IAccessor { IDictionary> _accessors; - public DefaultAccessor() + public DefaultAccessor() : base(true) { } diff --git a/net/DevExtreme.AspNet.Data/ExpressionCompiler.cs b/net/DevExtreme.AspNet.Data/ExpressionCompiler.cs index a5f95169..d06643f8 100644 --- a/net/DevExtreme.AspNet.Data/ExpressionCompiler.cs +++ b/net/DevExtreme.AspNet.Data/ExpressionCompiler.cs @@ -41,8 +41,8 @@ protected internal Expression CompileAccessorExpression(Expression target, strin } if(forceToString && currentTarget.Type != typeof(String)) - progression.Add(Expression.Call(currentTarget, typeof(Object).GetMethod(nameof(Object.ToString)))); - + progression.Add(Expression.Call(currentTarget, typeof(Object).GetMethod(nameof(Object.ToString)))); + return CompileNullGuard(progression); } diff --git a/net/DevExtreme.AspNet.Data/FilterExpressionCompiler.cs b/net/DevExtreme.AspNet.Data/FilterExpressionCompiler.cs index cddba69a..baf6d57a 100644 --- a/net/DevExtreme.AspNet.Data/FilterExpressionCompiler.cs +++ b/net/DevExtreme.AspNet.Data/FilterExpressionCompiler.cs @@ -12,7 +12,7 @@ namespace DevExtreme.AspNet.Data { class FilterExpressionCompiler : ExpressionCompiler { - public FilterExpressionCompiler(bool guardNulls) + public FilterExpressionCompiler(bool guardNulls) : base(guardNulls) { } @@ -28,7 +28,7 @@ Expression CompileCore(ParameterExpression dataItemExpr, IList criteriaJson) { try { if(IsUnary(criteriaJson)) { return CompileUnary(dataItemExpr, criteriaJson); - } + } return CompileBinary(dataItemExpr, criteriaJson); } catch { diff --git a/net/DevExtreme.AspNet.Data/NET40.cs b/net/DevExtreme.AspNet.Data/NET40.cs index c631105c..be8c21ff 100644 --- a/net/DevExtreme.AspNet.Data/NET40.cs +++ b/net/DevExtreme.AspNet.Data/NET40.cs @@ -10,7 +10,7 @@ namespace DevExtreme.AspNet.Data { // https://github.com/dotnet/coreclr/blob/release/1.0.0-rc1/src/mscorlib/src/System/Reflection/TypeInfo.cs static class TypeExtensions { - internal const BindingFlags + internal const BindingFlags EVERYTHING = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static; public static TypeInfo GetTypeInfo(this Type type) { @@ -53,4 +53,4 @@ public Type GetGenericTypeDefinition() { } } -#endif \ No newline at end of file +#endif diff --git a/net/DevExtreme.AspNet.Data/QueryableOnce.cs b/net/DevExtreme.AspNet.Data/QueryableOnce.cs index ab310a4b..def955b1 100644 --- a/net/DevExtreme.AspNet.Data/QueryableOnce.cs +++ b/net/DevExtreme.AspNet.Data/QueryableOnce.cs @@ -48,4 +48,4 @@ IEnumerator GetEnumerator() { } } -#endif \ No newline at end of file +#endif diff --git a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteCountAggregator.cs b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteCountAggregator.cs index 4bb28203..3ddc3c77 100644 --- a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteCountAggregator.cs +++ b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteCountAggregator.cs @@ -10,7 +10,7 @@ namespace DevExtreme.AspNet.Data.RemoteGrouping { class RemoteCountAggregator : Aggregator { int _count = 0; - public RemoteCountAggregator(IAccessor accessor) + public RemoteCountAggregator(IAccessor accessor) : base(accessor) { } diff --git a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupExpressionCompiler.cs b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupExpressionCompiler.cs index c454ee88..dd6c73e2 100644 --- a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupExpressionCompiler.cs +++ b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupExpressionCompiler.cs @@ -30,7 +30,7 @@ class RemoteGroupExpressionCompiler : ExpressionCompiler { Type _remoteGroupType; RemoteGroupTypeMarkup _remoteGroupTypeMarkup; - public RemoteGroupExpressionCompiler(GroupingInfo[] grouping, SummaryInfo[] totalSummary, SummaryInfo[] groupSummary) + public RemoteGroupExpressionCompiler(GroupingInfo[] grouping, SummaryInfo[] totalSummary, SummaryInfo[] groupSummary) : base(false) { _groupByParam = CreateItemParam(typeof(T)); @@ -140,7 +140,7 @@ Expression MakeAggregatingProjection(Expression target, ParameterExpression para } AddAggregateBindings(projectionBindings, param, _totalSummaryExprList, _totalSummaryParams, _totalSummaryTypes, _remoteGroupTypeMarkup.TotalSummaryStartIndex); - AddAggregateBindings(projectionBindings, param, _groupSummaryExprList, _groupSummaryParams, _groupSummaryTypes, _remoteGroupTypeMarkup.GroupSummaryStartIndex); + AddAggregateBindings(projectionBindings, param, _groupSummaryExprList, _groupSummaryParams, _groupSummaryTypes, _remoteGroupTypeMarkup.GroupSummaryStartIndex); var projectionLambda = Expression.Lambda( Expression.MemberInit( @@ -174,7 +174,7 @@ void AddAggregateBindings(ICollection bindingList, Expression ); } } - + static string GetPreAggregateMethodName(string summaryType) { switch(summaryType) { case "min": @@ -195,9 +195,9 @@ Expression CompileGroupInterval(Expression selector, string intervalString) { ExpressionType.Subtract, selector, Expression.MakeBinary( - ExpressionType.Modulo, - selector, - Expression.Convert( + ExpressionType.Modulo, + selector, + Expression.Convert( Expression.Constant(Int32.Parse(intervalString)), selector.Type ) diff --git a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupTypeMarkup.cs b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupTypeMarkup.cs index 03b9887d..3016798e 100644 --- a/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupTypeMarkup.cs +++ b/net/DevExtreme.AspNet.Data/RemoteGrouping/RemoteGroupTypeMarkup.cs @@ -26,11 +26,11 @@ public static int KeysStartIndex { } public int TotalSummaryStartIndex { - get { return KeysStartIndex + _groupCount; } + get { return KeysStartIndex + _groupCount; } } public int GroupSummaryStartIndex{ - get { return TotalSummaryStartIndex + _totalSummaryCount; } + get { return TotalSummaryStartIndex + _totalSummaryCount; } } } diff --git a/net/DevExtreme.AspNet.Data/SortExpressionCompiler.cs b/net/DevExtreme.AspNet.Data/SortExpressionCompiler.cs index bb0c79ee..3d5b632a 100644 --- a/net/DevExtreme.AspNet.Data/SortExpressionCompiler.cs +++ b/net/DevExtreme.AspNet.Data/SortExpressionCompiler.cs @@ -8,7 +8,7 @@ namespace DevExtreme.AspNet.Data { class SortExpressionCompiler : ExpressionCompiler { - public SortExpressionCompiler(bool guardNulls) + public SortExpressionCompiler(bool guardNulls) : base(guardNulls) { } diff --git a/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.cs b/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.cs index 77110d6e..7d3f27a7 100644 --- a/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.cs +++ b/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.cs @@ -1,5 +1,4 @@ // WARNING! GENERATED CODE! - using System; namespace DevExtreme.AspNet.Data.Types { diff --git a/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.tt b/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.tt index 37411217..8ac17059 100644 --- a/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.tt +++ b/net/DevExtreme.AspNet.Data/Types/AnonType.Generated.tt @@ -1,5 +1,5 @@ // WARNING! GENERATED CODE! -<#@ output extension=".cs" #> +<#@ output extension=".cs" #> <#@ assembly name="System.Core" #> <#@ import namespace="System.Linq" #> using System; @@ -82,4 +82,4 @@ namespace DevExtreme.AspNet.Data.Types { return String.Join(", ", Enumerable.Range(0, count).Select(i => String.Format(format, i))); } -#> \ No newline at end of file +#> diff --git a/net/DevExtreme.AspNet.Data/Utils.cs b/net/DevExtreme.AspNet.Data/Utils.cs index 13a9ff44..d65dfb4e 100644 --- a/net/DevExtreme.AspNet.Data/Utils.cs +++ b/net/DevExtreme.AspNet.Data/Utils.cs @@ -31,7 +31,7 @@ public static object ConvertClientValue(object value, Type type) { if(value == null || type == null) return value; - + type = StripNullableType(type); if(IsIntegralType(type) && value is String) diff --git a/net/Sample/Controllers/NorthwindController.cs b/net/Sample/Controllers/NorthwindController.cs index 7a386454..85c0fc36 100644 --- a/net/Sample/Controllers/NorthwindController.cs +++ b/net/Sample/Controllers/NorthwindController.cs @@ -97,7 +97,7 @@ public void DeleteOrder(int key) { [HttpGet("products")] public object Products(DataSourceLoadOptions loadOptions) { return DataSourceLoader.Load( - _nwind.Products.Include(p => p.Category), + _nwind.Products.Include(p => p.Category), loadOptions ); } diff --git a/net/Sample/Models/NorthwindContext.cs b/net/Sample/Models/NorthwindContext.cs index 93835e87..5906411f 100644 --- a/net/Sample/Models/NorthwindContext.cs +++ b/net/Sample/Models/NorthwindContext.cs @@ -52,4 +52,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) { public virtual DbSet Products { get; set; } public virtual DbSet Shippers { get; set; } } -} \ No newline at end of file +} diff --git a/net/Sample/Properties/launchSettings.json b/net/Sample/Properties/launchSettings.json index beda17a4..d2a17845 100644 --- a/net/Sample/Properties/launchSettings.json +++ b/net/Sample/Properties/launchSettings.json @@ -25,4 +25,4 @@ } } } -} \ No newline at end of file +} diff --git a/net/Sample/gulpfile.js b/net/Sample/gulpfile.js index 8b826acb..b62743a8 100644 --- a/net/Sample/gulpfile.js +++ b/net/Sample/gulpfile.js @@ -4,4 +4,4 @@ var gulp = require('gulp'); gulp.task('copy-js', function() { gulp.src("../../js/*.js").pipe(gulp.dest("wwwroot/lib")); -}); \ No newline at end of file +}); diff --git a/package.json b/package.json index d5ca193a..5f7d8071 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "webpack": "^1.14.0" }, "scripts": { - "eclint-check": "eclint check *.{yml,json} {net,js,js-test}/**/*.{cs,js,ts,html,json,cshtml} !net/**/{bin,obj}/** !js-test/test-bundle.js", + "eclint-check": "eclint check *.{yml,json} {net,js,js-test}/**/*.{cs,js,ts,html,json,cshtml,tt} !net/**/{bin,obj}/** !js-test/test-bundle.js", "pretest": "webpack --config js-test/test-bundle-webpack-config.js", "test": "jshint --verbose js && karma start js-test/karma.js && karma start js-test/karma.js --bundled && tsc js-test/check-ts-compilation" }