| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.services.correction.assist; | 5 library test.services.correction.assist; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/plugin/edit/assist/assist_core.dart'; | 9 import 'package:analysis_server/plugin/edit/assist/assist_core.dart'; |
| 10 import 'package:analysis_server/plugin/protocol/protocol.dart'; | 10 import 'package:analysis_server/plugin/protocol/protocol.dart'; |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 test_assignToLocalVariable_void() async { | 838 test_assignToLocalVariable_void() async { |
| 839 resolveTestUnit(''' | 839 resolveTestUnit(''' |
| 840 main() { | 840 main() { |
| 841 f(); | 841 f(); |
| 842 } | 842 } |
| 843 void f() {} | 843 void f() {} |
| 844 '''); | 844 '''); |
| 845 await assertNoAssistAt('f();', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE); | 845 await assertNoAssistAt('f();', DartAssistKind.ASSIGN_TO_LOCAL_VARIABLE); |
| 846 } | 846 } |
| 847 | 847 |
| 848 test_convertIntoBlockDocumentationComment_BAD_alreadyBlock() async { | 848 test_convertDocumentationIntoBlock_BAD_alreadyBlock() async { |
| 849 resolveTestUnit(''' | 849 resolveTestUnit(''' |
| 850 /** | 850 /** |
| 851 * AAAAAAA | 851 * AAAAAAA |
| 852 */ | 852 */ |
| 853 class A {} | 853 class A {} |
| 854 '''); | 854 '''); |
| 855 await assertNoAssistAt( | 855 await assertNoAssistAt( |
| 856 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK); | 856 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK); |
| 857 } | 857 } |
| 858 | 858 |
| 859 test_convertIntoBlockDocumentationComment_BAD_notDocumentation() async { | 859 test_convertDocumentationIntoBlock_BAD_notDocumentation() async { |
| 860 resolveTestUnit(''' | 860 resolveTestUnit(''' |
| 861 // AAAA | 861 // AAAA |
| 862 class A {} | 862 class A {} |
| 863 '''); | 863 '''); |
| 864 await assertNoAssistAt( | 864 await assertNoAssistAt( |
| 865 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK); | 865 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK); |
| 866 } | 866 } |
| 867 | 867 |
| 868 test_convertIntoBlockDocumentationComment_OK_onReference() async { | 868 test_convertDocumentationIntoBlock_OK_onReference() async { |
| 869 resolveTestUnit(''' | 869 resolveTestUnit(''' |
| 870 /// AAAAAAA [int] AAAAAAA | 870 /// AAAAAAA [int] AAAAAAA |
| 871 class A {} | 871 class A {} |
| 872 '''); | 872 '''); |
| 873 await assertHasAssistAt( | 873 await assertHasAssistAt( |
| 874 'nt]', | 874 'nt]', |
| 875 DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK, | 875 DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK, |
| 876 ''' | 876 ''' |
| 877 /** | 877 /** |
| 878 * AAAAAAA [int] AAAAAAA | 878 * AAAAAAA [int] AAAAAAA |
| 879 */ | 879 */ |
| 880 class A {} | 880 class A {} |
| 881 '''); | 881 '''); |
| 882 } | 882 } |
| 883 | 883 |
| 884 test_convertIntoBlockDocumentationComment_OK_onText() async { | 884 test_convertDocumentationIntoBlock_OK_onText() async { |
| 885 resolveTestUnit(''' | 885 resolveTestUnit(''' |
| 886 class A { | 886 class A { |
| 887 /// AAAAAAA [int] AAAAAAA | 887 /// AAAAAAA [int] AAAAAAA |
| 888 /// BBBBBBBB BBBB BBBB | 888 /// BBBBBBBB BBBB BBBB |
| 889 /// CCC [A] CCCCCCCCCCC | 889 /// CCC [A] CCCCCCCCCCC |
| 890 mmm() {} | 890 mmm() {} |
| 891 } | 891 } |
| 892 '''); | 892 '''); |
| 893 await assertHasAssistAt( | 893 await assertHasAssistAt( |
| 894 'AAA [', | 894 'AAA [', |
| 895 DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK, | 895 DartAssistKind.CONVERT_DOCUMENTATION_INTO_BLOCK, |
| 896 ''' | 896 ''' |
| 897 class A { | 897 class A { |
| 898 /** | 898 /** |
| 899 * AAAAAAA [int] AAAAAAA | 899 * AAAAAAA [int] AAAAAAA |
| 900 * BBBBBBBB BBBB BBBB | 900 * BBBBBBBB BBBB BBBB |
| 901 * CCC [A] CCCCCCCCCCC | 901 * CCC [A] CCCCCCCCCCC |
| 902 */ | 902 */ |
| 903 mmm() {} | 903 mmm() {} |
| 904 } | 904 } |
| 905 '''); | 905 '''); |
| 906 } | 906 } |
| 907 | 907 |
| 908 test_convertDocumentationIntoLine_BAD_alreadyLine() async { |
| 909 resolveTestUnit(''' |
| 910 /// AAAAAAA |
| 911 class A {} |
| 912 '''); |
| 913 await assertNoAssistAt( |
| 914 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE); |
| 915 } |
| 916 |
| 917 test_convertDocumentationIntoLine_BAD_notDocumentation() async { |
| 918 resolveTestUnit(''' |
| 919 /* AAAA */ |
| 920 class A {} |
| 921 '''); |
| 922 await assertNoAssistAt( |
| 923 'AAA', DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE); |
| 924 } |
| 925 |
| 926 test_convertDocumentationIntoLine_OK_onReference() async { |
| 927 resolveTestUnit(''' |
| 928 /** |
| 929 * AAAAAAA [int] AAAAAAA |
| 930 */ |
| 931 class A {} |
| 932 '''); |
| 933 await assertHasAssistAt( |
| 934 'nt]', |
| 935 DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE, |
| 936 ''' |
| 937 /// AAAAAAA [int] AAAAAAA |
| 938 class A {} |
| 939 '''); |
| 940 } |
| 941 |
| 942 test_convertDocumentationIntoLine_OK_onText() async { |
| 943 resolveTestUnit(''' |
| 944 class A { |
| 945 /** |
| 946 * AAAAAAA [int] AAAAAAA |
| 947 * BBBBBBBB BBBB BBBB |
| 948 * CCC [A] CCCCCCCCCCC |
| 949 */ |
| 950 mmm() {} |
| 951 } |
| 952 '''); |
| 953 await assertHasAssistAt( |
| 954 'AAA [', |
| 955 DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE, |
| 956 ''' |
| 957 class A { |
| 958 /// AAAAAAA [int] AAAAAAA |
| 959 /// BBBBBBBB BBBB BBBB |
| 960 /// CCC [A] CCCCCCCCCCC |
| 961 mmm() {} |
| 962 } |
| 963 '''); |
| 964 } |
| 965 |
| 966 test_convertDocumentationIntoLine_OK_onText_hasFirstLine() async { |
| 967 resolveTestUnit(''' |
| 968 class A { |
| 969 /** AAAAAAA [int] AAAAAAA |
| 970 * BBBBBBBB BBBB BBBB |
| 971 * CCC [A] CCCCCCCCCCC |
| 972 */ |
| 973 mmm() {} |
| 974 } |
| 975 '''); |
| 976 await assertHasAssistAt( |
| 977 'AAA [', |
| 978 DartAssistKind.CONVERT_DOCUMENTATION_INTO_LINE, |
| 979 ''' |
| 980 class A { |
| 981 /// AAAAAAA [int] AAAAAAA |
| 982 /// BBBBBBBB BBBB BBBB |
| 983 /// CCC [A] CCCCCCCCCCC |
| 984 mmm() {} |
| 985 } |
| 986 '''); |
| 987 } |
| 988 |
| 908 test_convertToBlockBody_OK_async() async { | 989 test_convertToBlockBody_OK_async() async { |
| 909 resolveTestUnit(''' | 990 resolveTestUnit(''' |
| 910 class A { | 991 class A { |
| 911 mmm() async => 123; | 992 mmm() async => 123; |
| 912 } | 993 } |
| 913 '''); | 994 '''); |
| 914 await assertHasAssistAt( | 995 await assertHasAssistAt( |
| 915 'mmm()', | 996 'mmm()', |
| 916 DartAssistKind.CONVERT_INTO_BLOCK_BODY, | 997 DartAssistKind.CONVERT_INTO_BLOCK_BODY, |
| 917 ''' | 998 ''' |
| (...skipping 2855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3773 positions.add(new Position(testFile, offset)); | 3854 positions.add(new Position(testFile, offset)); |
| 3774 } | 3855 } |
| 3775 return positions; | 3856 return positions; |
| 3776 } | 3857 } |
| 3777 | 3858 |
| 3778 void _setStartEndSelection() { | 3859 void _setStartEndSelection() { |
| 3779 offset = findOffset('// start\n') + '// start\n'.length; | 3860 offset = findOffset('// start\n') + '// start\n'.length; |
| 3780 length = findOffset('// end') - offset; | 3861 length = findOffset('// end') - offset; |
| 3781 } | 3862 } |
| 3782 } | 3863 } |
| OLD | NEW |