Merge pull request #1275 from tulinkry/scope-collapse

removing the ugly content jump on scope collapse

Author: tarzanek

src/org/opensolaris/opengrok/analysis/JFlexXref.java

@@ -479,38 +479,42 @@ protected String htmlize(String raw) {
     protected void startNewLine() throws IOException {
         String iconId = null;
         int line = getLineNumber() + 1;
+        boolean skipNl = false;
         setLineNumber(line);
 
         if (scopesEnabled) {
             startScope();
 
             if (scopeOpen && scope == null) {
                 scopeOpen = false;
-                out.write("</span>");
+                out.write("\n</span>");
+                skipNl = true;
             } else if (scope != null) {
                 String scopeId = generateId(scope);
                 if (scope.getLineFrom() == line) {
-                    out.write("<span id='");
+                    out.write("\n<span id='");
                     out.write(scopeId);
                     out.write("' class='scope-head'><span class='scope-signature'>");
                     out.write(htmlize(scope.getName() + scope.getSignature()));
                     out.write("</span>");
                     iconId = scopeId + "_fold_icon";
+                    skipNl = true;
                 } else if (scope.getLineFrom() == line - 1) {
                     if (scopeOpen) {
                         out.write("</span>");
                     }
 
-                    out.write("<span id='");
+                    out.write("\n<span id='");
                     out.write(scopeId);
                     out.write("_fold' class='scope-body'>");
+                    skipNl = true;
                 }
                 scopeOpen = true;
             }
         }
 
         Util.readableLine(line, out, annotation, userPageLink, userPageSuffix,
-                getProjectPostfix(true));
+                getProjectPostfix(true), skipNl);
 
         if (foldingEnabled && scopesEnabled) {
             if (iconId != null) {