Organize Members hint: don't rearrange record components #8220
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.modules.java.hints; | ||
|
|
||
| import java.util.prefs.Preferences; | ||
| import org.netbeans.api.editor.mimelookup.MimeLookup; | ||
| import org.netbeans.junit.NbTestCase; | ||
| import org.netbeans.modules.editor.java.JavaKit; | ||
| import org.netbeans.modules.java.hints.test.api.HintTest; | ||
| import org.netbeans.modules.java.ui.FmtOptions; | ||
| import org.openide.util.NbBundle; | ||
|
|
||
| /** | ||
| * @author mbien | ||
| */ | ||
| public class OrganizeMembersTest extends NbTestCase { | ||
|
|
||
| public OrganizeMembersTest(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| @Override | ||
| protected void setUp() throws Exception { | ||
| super.setUp(); | ||
| HintTest.create(); // initializes lookup (stolen from bugs.TinyTest) | ||
| MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE) | ||
| .lookup(Preferences.class) | ||
| .putBoolean(FmtOptions.sortMembersInGroups, true); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean runInEQ() { | ||
| // without it, hint markers are sometimes not found | ||
| return true; | ||
| } | ||
|
Comment on lines
+47
to
+51
There was a problem hiding this comment. don't know why this is needed.
|
||
|
|
||
| public void testSimpleMemberSort() throws Exception { | ||
| HintTest.create() | ||
| .sourceLevel(11) | ||
| .input( | ||
| """ | ||
| package test; | ||
| public class Test { | ||
| public static int b; | ||
| public static int a; | ||
| } | ||
| """ | ||
| ) | ||
| .run(OrganizeMembers.class) | ||
| .findWarning("2:4-2:24:verifier:" + NbBundle.getMessage(OrganizeMembers.class, "MSG_OragnizeMembers")) | ||
| .applyFix() | ||
| .assertOutput( | ||
| """ | ||
| package test; | ||
| public class Test { | ||
| public static int a; | ||
| public static int b; | ||
| } | ||
| """ | ||
| ); | ||
| } | ||
|
|
||
| public void testRecordMemberSort() throws Exception { | ||
| HintTest.create() | ||
| .sourceLevel(17) | ||
| .input( | ||
| """ | ||
| package test; | ||
| public record Test(int d, int c) { | ||
| public static int b; | ||
| public static int a; | ||
| } | ||
| """ | ||
| ) | ||
| .run(OrganizeMembers.class) | ||
| .findWarning("2:4-2:24:verifier:" + NbBundle.getMessage(OrganizeMembers.class, "MSG_OragnizeMembers")) | ||
| .applyFix() | ||
| .assertOutput( | ||
| """ | ||
| package test; | ||
| public record Test(int d, int c) { | ||
| public static int a; | ||
| public static int b; | ||
| } | ||
| """ | ||
| ); | ||
| } | ||
|
|
||
| public void testEnumMemberSort() throws Exception { | ||
| HintTest.create() | ||
| .sourceLevel(11) | ||
| .input( | ||
| """ | ||
| package test; | ||
| public enum Test { | ||
| B, A; | ||
| public static int b; | ||
| public static int a; | ||
| } | ||
| """ | ||
| ) | ||
| .run(OrganizeMembers.class) | ||
| .findWarning("3:4-3:24:verifier:" + NbBundle.getMessage(OrganizeMembers.class, "MSG_OragnizeMembers")) | ||
| .applyFix() | ||
| .assertOutput( | ||
| """ | ||
| package test; | ||
| public enum Test { | ||
| B, A; | ||
| public static int a; | ||
| public static int b; | ||
| } | ||
| """ | ||
| ); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thought this is lower risk than updating
isSynthetic()although it probably should be updated at some point.inserting
at
netbeans/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
Line 212 in e38f618