Skip to content

Commit 73d463c

Browse files
srawlinsCommit Queue
authored andcommitted
DAS: Tidy uses of isOriginDeclaration
Just some switch expression opportunities. Change-Id: Ida87e1e65773bb5b481c40549a7b13c5605eade2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/465967 Auto-Submit: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent d11262d commit 73d463c

File tree

2 files changed

+13
-28
lines changed

2 files changed

+13
-28
lines changed

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,13 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
127127

128128
@override
129129
Future<void> fillChange() async {
130-
// prepare elements
131-
var elements = <Element>[];
132-
switch (element) {
133-
case PropertyInducingElement element:
134-
if (element.isOriginGetterSetter) {
135-
var getter = element.getter;
136-
var setter = element.setter;
137-
if (getter != null) {
138-
elements.add(getter);
139-
}
140-
if (setter != null) {
141-
elements.add(setter);
142-
}
143-
} else {
144-
elements.add(element);
145-
}
146-
default:
147-
elements.add(element);
148-
}
130+
var elements = switch (element) {
131+
PropertyInducingElement element when element.isOriginGetterSetter => [
132+
?element.getter,
133+
?element.setter,
134+
],
135+
_ => [element],
136+
};
149137

150138
// Rename each element and references to it.
151139
var processor = RenameProcessor(workspace, sessionHelper, change, newName);

pkg/analysis_server/lib/src/status/utilities/element_writer.dart

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,12 @@ class ElementWriter with TreeWriter {
134134
void _writeElement(Element element) {
135135
indent();
136136

137-
var showItalic = false;
138-
switch (element) {
139-
case ConstructorElement():
140-
showItalic = !element.isOriginDeclaration;
141-
case PropertyAccessorElement():
142-
showItalic = !element.isOriginDeclaration;
143-
case PropertyInducingElement():
144-
showItalic = !element.isOriginDeclaration;
145-
}
137+
var showItalic = switch (element) {
138+
ConstructorElement() => !element.isOriginDeclaration,
139+
PropertyAccessorElement() => !element.isOriginDeclaration,
140+
PropertyInducingElement() => !element.isOriginDeclaration,
141+
_ => false,
142+
};
146143

147144
if (showItalic) {
148145
buffer.write('<i>');

0 commit comments

Comments
 (0)