Order by access modifier now configurable. #359

ahalassy · 2016-10-25T13:06:31Z

No description provided.

Signed-off-by: Adam Halassy <[email protected]>

[mod] Ordering by access level now can be configured

Dev

codecadwallader

Thanks again for putting these changes together. I've got a couple questions and a handful of nitpicks (as one would hopefully expect from a code cleaning project ;)), but overall looks good!

codecadwallader · 2016-10-27T11:46:25Z

CodeMaid/Helpers/CodeItemTypeComparer.cs

-                case vsCMAccess.vsCMAccessPrivate: return 6;
-                default: return 0;
-            }
+            var itemsOrder = new[] {


Instead of starting in arrays, and converting to list.. why not just use lists?

codecadwallader · 2016-10-27T11:47:58Z

CodeMaid/Helpers/CodeItemTypeComparer.cs

+                vsCMAccess.vsCMAccessProtected,
+                vsCMAccess.vsCMAccessPrivate
+                };
+            if (!Settings.Default.Reorganizing_RevertAccessLevel)


Revert isn't a clear verb to me (means go back to an original state). I think you mean Reverse access level. In that case though, wouldn't this be a positive case where only if the flag was set would the reversal happen?

codecadwallader · 2016-10-27T11:48:34Z

CodeMaid/Helpers/CodeItemTypeComparer.cs

+            if (!Settings.Default.Reorganizing_RevertAccessLevel)
+                itemsOrder = itemsOrder.Reverse().ToArray();
+
+            return itemsOrder.Contains(codeItemElement.Access)


IndexOf always returns -1 when no match is found, so you could remove the conditional and always return IndexOf+1.

codecadwallader · 2016-10-27T11:52:15Z

CodeMaid/UI/Dialogs/Options/Reorganizing/ReorganizingGeneralDataTemplate.xaml

@@ -15,6 +15,18 @@
                        <RadioButton Content="type then access" IsChecked="{Binding PrimaryOrderByAccessLevel, Converter={x:Static cnv:BooleanInverseConverter.Default}}" />
                        <RadioButton Content="access then type" IsChecked="{Binding PrimaryOrderByAccessLevel}" />
                    </StackPanel>
+                    <StackPanel


More nitpicks:

Can we follow the formatting conventions of the rest of the file (e.g. attributes on same line)

Can we use the same verbiage as other options.. (e.g. "Access levels should be ordered by" with the default option being first "public to private" and the alternate option being second "private to public")

codecadwallader · 2016-10-27T11:52:49Z

CodeMaid/UI/Dialogs/Options/Reorganizing/ReorganizingGeneralViewModel.cs

@@ -25,7 +25,8 @@ public ReorganizingGeneralViewModel(CodeMaidPackage package, Settings activeSett
                new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Reorganizing_KeepMembersWithinRegions, x => KeepMembersWithinRegions),
                new SettingToOptionMapping<int, AskYesNo>(x => ActiveSettings.Reorganizing_PerformWhenPreprocessorConditionals, x => PerformWhenPreprocessorConditionals),
                new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Reorganizing_PrimaryOrderByAccessLevel, x => PrimaryOrderByAccessLevel),
-                new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Reorganizing_RunAtStartOfCleanup, x => RunAtStartOfCleanup)
+                new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Reorganizing_RunAtStartOfCleanup, x => RunAtStartOfCleanup),
+                new SettingToOptionMapping<bool, bool>(x => ActiveSettings.Reorganizing_RevertAccessLevel, x => RevertOrderByAccessLevel)


Will you please move this up to continue the alphabetical ordering.

codecadwallader · 2016-10-27T11:54:54Z

CodeMaid/UI/Dialogs/Options/Reorganizing/ReorganizingGeneralViewModel.cs

+        /// <value>
+        /// <c>true</c> if [revert order by access level]; otherwise, <c>false</c>.
+        /// </value>
+        public bool RevertOrderByAccessLevel


Will you please move this up to continue the alphabetical ordering. It would also be helpful to match the comment style to the others vs. auto-generated.

Perhaps a clearer name for this property would be ReverseAccessLevelOrdering

ahalassy · 2016-10-27T12:01:26Z

Thanks for all the notes I am going to fix the code keeping this in my mind. Also, I noticed that the code ordering puts the static members to the end of the code however I need the opposite ordering in my codes. Anyway, I also implemented configuration for for static member ordering in my fork. I am going to review that taking in consideration your notes and add those changes to this pull request within a few days. Do you agree or should I handle this on a different request?

codecadwallader · 2016-10-27T12:04:13Z

Sounds good. It's pretty closely related so I'm OK with it being on the same pull request. You may already be thinking it but it sounds like a separate configuration option to reverse static members.

ahalassy · 2016-10-27T12:06:26Z

It definitely is a separate configuration option with it's own GUI option and setting field.

# Conflicts: # CodeMaid/Properties/Settings.Designer.cs Signed-off-by: Adam Halassy <[email protected]>

Features/order by visibility

ahalassy · 2017-03-13T16:07:28Z

Hi! Sorry for the long delay, I was quite busy during the last few months. I made several changes to align with your conventions. Can you have a look?

codecadwallader · 2017-03-14T23:32:22Z

Looks good to me! Merging in to master now. :) Thanks again for your contribution! I hope you don't mind if I credit you during the next release?

codecadwallader · 2017-03-15T00:00:14Z

I made a couple formatting tweaks.. and I'm questioning the reversal logic now. The setting is off by default (i.e. public -> private).. yet in CodeItemTypeComparer it is reversing the items order when the setting is not true (i.e. off). Should the exclamation mark be removed, or am I looked at it backwards?

ahalassy · 2017-03-15T08:12:30Z

I need to check this. Previously I planned to create a similar enhancement for static-instance level ordering - I am going to implement this. I'll check this as well, and I'll inform you if further alignments needed. My original intention was to keep your logic as default.

codecadwallader · 2017-03-15T10:30:50Z

Ok, sounds good. I went ahead and flipped that statement as I'm pretty sure from tracing through the logic it was inverted. Thanks for taking a look!

codecadwallader · 2017-03-23T09:44:33Z

I did retest that logic and confirm it's correct now.

Adam Halassy and others added 3 commits October 25, 2016 10:28

[mod] Ordering by access level now can be configured

6fcc19b

Signed-off-by: Adam Halassy <[email protected]>

Merge pull request #1 from ahalassy/features/order-by-visibility

394bcc8

[mod] Ordering by access level now can be configured

Merge pull request #2 from ahalassy/dev

3aab213

Dev

codecadwallader requested changes Oct 27, 2016

View reviewed changes

ahalassy added 4 commits March 13, 2017 16:01

Merge branch 'master' of https://github.com/codecadwallader/codemaid

5a48abe

# Conflicts: # CodeMaid/Properties/Settings.Designer.cs Signed-off-by: Adam Halassy <[email protected]>

[mod] Conventions aligned with pull request comments.

ff3faea

[mod] The default item changed.

33f374a

Merge pull request #3 from ahalassy/features/order-by-visibility

055628d

Features/order by visibility

codecadwallader merged commit 6b710b7 into codecadwallader:master Mar 14, 2017

codecadwallader added this to the v10.3 milestone Mar 15, 2017

codecadwallader added enhancement feature: reorganizing labels Mar 15, 2017

codecadwallader mentioned this pull request Mar 22, 2017

Feature Request: Spade sort by type should by default also sort by name, within each type #417

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Order by access modifier now configurable. #359

Order by access modifier now configurable. #359

ahalassy commented Oct 25, 2016

codecadwallader left a comment

codecadwallader Oct 27, 2016

codecadwallader Oct 27, 2016

codecadwallader Oct 27, 2016

codecadwallader Oct 27, 2016

codecadwallader Oct 27, 2016

codecadwallader Oct 27, 2016

ahalassy commented Oct 27, 2016

codecadwallader commented Oct 27, 2016

ahalassy commented Oct 27, 2016

ahalassy commented Mar 13, 2017

codecadwallader commented Mar 14, 2017

codecadwallader commented Mar 15, 2017

ahalassy commented Mar 15, 2017

codecadwallader commented Mar 15, 2017

codecadwallader commented Mar 23, 2017

Order by access modifier now configurable. #359

Order by access modifier now configurable. #359

Conversation

ahalassy commented Oct 25, 2016

codecadwallader left a comment

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

codecadwallader Oct 27, 2016

Choose a reason for hiding this comment

ahalassy commented Oct 27, 2016

codecadwallader commented Oct 27, 2016

ahalassy commented Oct 27, 2016

ahalassy commented Mar 13, 2017

codecadwallader commented Mar 14, 2017

codecadwallader commented Mar 15, 2017

ahalassy commented Mar 15, 2017

codecadwallader commented Mar 15, 2017

codecadwallader commented Mar 23, 2017