Get block tags to be reflowed. Clean up.

scripts/lib/bashy-node/node-project/reflow-jsdoc

@@ -52,70 +52,64 @@ inCodeQuote {
  next;
 }
 
-# Paragraph separator.
-inDoc && /^ *[*]$/ {
- autoflowLines();
- print;
- next;
-}
-
-# Start of a tag. (Should be handled, but not yet implemented.)
-inDoc && /^ *[*] *@/ {
+# End of doc comment block.
+inDoc && /^ *[*]\/$/ {
  autoflowLines();
  inDoc = 0;
 }
 
-# End of doc comment block.
-inDoc && /^ *[*]\/$/ {
+# Paragraph separator.
+inDoc && /^ *[*]$/ {
  autoflowLines();
- inDoc = 0;
+ print;
+ next;
 }
 
-# Additional line in current paragraph, or possibly start of new paragraph (if
-# indentation changes; not perfect but good enough for a follow-on human pass).
+# Additional line in current paragraph, or start of new paragraph (if
+# indentation changes).
 inDoc {
- if (indent == "") {
-  indent = $0;
- match(indent, /^[ *]* /);
- firstIndent = substr(indent, RSTART, RLENGTH);
+ thisIndent = matchIndent($0);
+ if ((indent == "") || (indent != thisIndent)) {
+ autoflowLines();
+ firstIndent = thisIndent;
  indent = calcIndent(firstIndent);
+ indentLength = length(firstIndent);
  } else {
- newIndent = $0;
- match(newIndent, /^[ *]* /);
- newIndent = substr(newIndent, RSTART, RLENGTH);
- if (indent != newIndent) {
- autoflowLines();
- firstIndent = newIndent;
- indent = calcIndent(firstIndent);
- }
+ # Expected the-rest-indent.
+ indentLength = length(indent);
  }
- lines[count] = $0;
+
+ lines[count] = substr($0, indentLength + 1);
  count++;
  next;
 }
 
 { print; }
 
+# Matches any of the allowed "indent" patterns (which also includes `@tag`s for
+# block tags).
+function matchIndent(line) {
+ match(line, /^ *[*] ([ *]*|@[a-zA-Z]+ +)/);
+ return substr(line, RSTART, RLENGTH);
+}
+
 # Convert a first-indent into a the-rest-indent.
 function calcIndent(firstIndent, _locals_, result) {
  result = firstIndent;
  match(result, /^ *[*] /);
  result = substr(result, RSTART, RLENGTH);
  while (length(result) < length(firstIndent)) result = result " ";
- #print "FIRST <" firstIndent "> REST <" result ">";
  return result;
 }
 
 # Emit one paragraph of comment.
 function autoflowLines(_locals_, curIndent, i, line, text) {
  if (count == 0) return;
 
- #print "INDENTS: <" firstIndent "> <" indent ">";
-
  text = "";
  for (i = 0; i < count; i++) {
  line = lines[i];
- sub(/^[ *]* /, "", line);
+ sub(/^ */, "", line);
  if (i == 0) text = line;
  else text = text " " line;
  }