Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/io/flutter/editor/FlutterColorProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public Color getColorFrom(@NotNull PsiElement element) {

if (parent.getNode().getElementType() == DartTokenTypes.ARRAY_ACCESS_EXPRESSION) {
// Colors.blue[200]
if (!refExpr.getFirstChild().getText().equals("Colors") && !refExpr.getFirstChild().getText().equals("CupertinoColors")) {
return null;
}
if (name.equals(refExpr.getFirstChild().getText()) && refExpr.getChildren().length > 1) {
// Avoid duplicate resolves.
return null;
Expand Down Expand Up @@ -116,7 +119,7 @@ else if (parent.getNode().getElementType() == DartTokenTypes.SIMPLE_TYPE) {
// name.equals(refExpr.getFirstChild().getText()) -> Colors.blue
final PsiElement idNode = refExpr.getFirstChild();
if (idNode == null) return null;
if (name.equals(idNode.getText())) {
if ((name.equals("Colors") || name.equals("CupertinoColors")) && name.equals(idNode.getText())) {
final PsiElement selectorNode = refExpr.getLastChild();
if (selectorNode == null) return null;
final String code = AstBufferUtil.getTextSkippingWhitespaceComments(selectorNode.getNode());
Expand Down
Loading