-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Visual indent guides (soft margins) initial implementation (IDEA-99875)
- Loading branch information
1 parent
723f8ad
commit 2a17866
Showing
29 changed files
with
965 additions
and
184 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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
109 changes: 109 additions & 0 deletions
109
platform/lang-api/src/com/intellij/psi/codeStyle/SoftMargins.java
This file contains 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,109 @@ | ||
| /* | ||
| * Copyright 2000-2017 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.psi.codeStyle; | ||
|
|
||
| import com.intellij.util.xmlb.XmlSerializer; | ||
| import org.jdom.Element; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| class SoftMargins implements Cloneable { | ||
|
|
||
| private List<Integer> myValues; | ||
|
|
||
| @SuppressWarnings("unused") // Serialization getter | ||
| @Nullable | ||
| public String getSOFT_MARGINS() { | ||
| return myValues != null ? toString() : null; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // Serialization setter | ||
| public void setSOFT_MARGINS(@Nullable String valueList) { | ||
| if (valueList != null) { | ||
| String[] values = valueList.split(",\\s*"); | ||
| myValues = new ArrayList<>(values.length); | ||
| int i = 0; | ||
| for (String value : values) { | ||
| try { | ||
| myValues.add(Integer.parseInt(value)); | ||
| } | ||
| catch (NumberFormatException nfe) { | ||
| myValues = null; | ||
| return; | ||
| } | ||
| } | ||
| Collections.sort(myValues); | ||
| } | ||
| } | ||
|
|
||
| @NotNull | ||
| List<Integer> getValues() { | ||
| return myValues != null ? myValues : Collections.emptyList(); | ||
| } | ||
|
|
||
| void setValues(List<Integer> values) { | ||
| if (values != null) { | ||
| myValues = new ArrayList<>(values); | ||
| Collections.sort(myValues); | ||
| } | ||
| else { | ||
| myValues = null; | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings("MethodDoesntCallSuperMethod") | ||
| @Override | ||
| public Object clone() { | ||
| SoftMargins copy = new SoftMargins(); | ||
| copy.setValues(myValues); | ||
| return copy; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (obj instanceof SoftMargins) { | ||
| List<Integer> otherMargins = ((SoftMargins)obj).getValues(); | ||
| return otherMargins.equals(getValues()); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| if (myValues != null) { | ||
| for (int margin: myValues) { | ||
| if (sb.length() > 0) sb.append(","); | ||
| sb.append(margin); | ||
| } | ||
| } | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| public void serializeInto(@NotNull Element element) { | ||
| if (myValues != null && myValues.size() > 0) { | ||
| XmlSerializer.serializeInto(this, element); | ||
| } | ||
| } | ||
|
|
||
| public void deserializeFrom(@NotNull Element element) { | ||
| XmlSerializer.deserializeInto(this, element); | ||
| } | ||
| } |
This file contains 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
27 changes: 27 additions & 0 deletions
27
...ang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSoftMarginsPresentation.java
This file contains 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,27 @@ | ||
| /* | ||
| * Copyright 2000-2017 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.psi.codeStyle.presentation; | ||
|
|
||
| import com.intellij.openapi.application.ApplicationBundle; | ||
|
|
||
| public class CodeStyleSoftMarginsPresentation extends CodeStyleSettingPresentation { | ||
|
|
||
| public static final String OPTION_NAME = "SoftMargins"; | ||
|
|
||
| public CodeStyleSoftMarginsPresentation() { | ||
| super(OPTION_NAME, ApplicationBundle.message("settings.code.style.visual.guides")); | ||
| } | ||
| } |
This file contains 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.