MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

review cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-04-19 12:43:53 +04:00
parent 41c46d182e
commit 6edb04da9c
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+9 -6
View File
@@ -110,7 +110,7 @@ public class HighlightInfo implements Segment {
String toolTip = this.toolTip;
String description = this.description;
if (toolTip == null || description == null || !toolTip.contains(DESCRIPTION_PLACEHOLDER)) return toolTip;
String decoded = toolTip.replace(DESCRIPTION_PLACEHOLDER, XmlStringUtil.escapeString(description));
String decoded = StringUtil.replace(toolTip, DESCRIPTION_PLACEHOLDER, XmlStringUtil.escapeString(description));
String niceTooltip = XmlStringUtil.wrapInHtml(decoded);
return niceTooltip;
}
@@ -119,12 +119,13 @@ public class HighlightInfo implements Segment {
if (toolTip == null || description == null) return toolTip;
String unescaped = StringUtil.unescapeXml(XmlStringUtil.stripHtml(toolTip));
if (unescaped.contains(description)) {
String encoded = unescaped.replace(description, DESCRIPTION_PLACEHOLDER);
if (encoded.equals(DESCRIPTION_PLACEHOLDER)) encoded = DESCRIPTION_PLACEHOLDER;
return encoded;
String encoded = StringUtil.replace(unescaped, description, DESCRIPTION_PLACEHOLDER);
//noinspection StringEquality
if (encoded == unescaped) {
return toolTip;
}
return toolTip;
if (encoded.equals(DESCRIPTION_PLACEHOLDER)) encoded = DESCRIPTION_PLACEHOLDER;
return encoded;
}
public String getDescription() {
@@ -135,11 +136,13 @@ public class HighlightInfo implements Segment {
@interface FlagConstant {}
private boolean isFlagSet(@FlagConstant int flag) {
assert flag < 8;
int state = myFlags >> flag;
return (state & 1) != 0;
}
private void setFlag(@FlagConstant int flag, boolean value) {
assert flag < 8;
int state = value ? 1 : 0;
myFlags = (byte)(myFlags & ~(1 << flag) | state << flag);
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+6 -4
View File
@@ -625,11 +625,13 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
int start = hostRange.getStartOffset();
int end = hostRange.getEndOffset();
HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(info.type).range(element, start, end);
if (info.getDescription() != null) {
builder.description(info.getDescription());
String description = info.getDescription();
if (description != null) {
builder.description(description);
}
if (info.getToolTip() != null) {
builder.escapedToolTip(info.getToolTip());
String toolTip = info.getToolTip();
if (toolTip != null) {
builder.escapedToolTip(toolTip);
}
HighlightInfo patched = builder.createUnconditionally();
if (patched.startOffset != patched.endOffset || info.startOffset == info.endOffset) {