From bd5c95099ab4e9f1c2d5c0f8d12bac4c0fc8f1d3 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 6 Jun 2016 00:46:59 +0200 Subject: [PATCH] SUPPORTED_TYPES.contains(token) --- .../xml/arrangement/XmlRearranger.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/arrangement/XmlRearranger.java b/xml/impl/src/com/intellij/xml/arrangement/XmlRearranger.java index 25ede0477eba..b1bcf220064f 100644 --- a/xml/impl/src/com/intellij/xml/arrangement/XmlRearranger.java +++ b/xml/impl/src/com/intellij/xml/arrangement/XmlRearranger.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2016 JetBrains s.r.o. + * + * Licensed 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 com.intellij.xml.arrangement; import com.intellij.openapi.editor.Document; @@ -21,7 +36,8 @@ import java.util.*; import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.XML_ATTRIBUTE; import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.XML_TAG; -import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.General.*; +import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.General.ORDER; +import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.General.TYPE; import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Order.BY_NAME; import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Order.KEEP; @@ -70,8 +86,11 @@ public class XmlRearranger @Override public boolean isEnabled(@NotNull ArrangementSettingsToken token, @Nullable ArrangementMatchCondition current) { - return SUPPORTED_TYPES.contains(token) || StdArrangementTokens.Regexp.NAME.equals(token) || StdArrangementTokens.Regexp.XML_NAMESPACE.equals(token) || KEEP.equals(token) - || BY_NAME.equals(token) || SUPPORTED_TYPES.contains(token); + return SUPPORTED_TYPES.contains(token) + || StdArrangementTokens.Regexp.NAME.equals(token) + || StdArrangementTokens.Regexp.XML_NAMESPACE.equals(token) + || KEEP.equals(token) + || BY_NAME.equals(token); } @NotNull