opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Fix: NullPointerException of dashboard title
  Properly handle double click on external group in GroupTable
  Add plugin repositories section in the pom
  PrettyFormatter: Fix expand tab when syntax coloring is on.
This commit is contained in:
Shawn Pearce
2013-07-05 18:55:24 -07:00
parent e4a159d371 6ad00aa21b
commit b85c70efc7
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/ClientSideFormatter.java
View File

@@ -60,13 +60,12 @@ public class ClientSideFormatter extends PrettyFormatter {
@Override
protected String prettify(String html, String type) {
return go(prettify.getContext(), html, type, diffPrefs.getTabSize());
return go(prettify.getContext(), html, type);
}
private static native String go(JavaScriptObject ctx, String srcText,
String srcType, int tabSize)
String srcType)
/*-{
ctx.PR_TAB_WIDTH = tabSize;
return ctx.prettyPrintOne(srcText, srcType);
}-*/;
}

3
gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrettyFormatter.java
View File

@@ -129,6 +129,7 @@ public abstract class PrettyFormatter implements SparseHtmlFile {
String html = toHTML(src);
html = expandTabs(html);
if (diffPrefs.isSyntaxHighlighting() && getFileType() != null
&& src.isWholeFile()) {
// The prettify parsers don't like ' as an entity for the
@@ -149,8 +150,6 @@ public abstract class PrettyFormatter implements SparseHtmlFile {
html = html.replaceAll("(\r)?\n", " $1\n");
html = prettify(html, getFileType());
html = html.replaceAll(" (\r)?\n", "$1\n");
} else {
html = expandTabs(html);
}
int pos = 0;