JS: Extract type source text with substring

Author: asger-semmle

javascript/extractor/src/com/semmle/js/parser/JSDocParser.java

@@ -1259,7 +1259,6 @@ private int seekContent() {
     private JSDocTypeExpression parseType(String title, int last) throws ParseError {
       char ch;
       int brace;
-      StringBuilder type;
       boolean direct = false;
 
       // search '{'
@@ -1280,35 +1279,34 @@ private JSDocTypeExpression parseType(String title, int last) throws ParseError
       if (!direct) {
         // type expression { is found
         brace = 1;
-        type = new StringBuilder();
+        int startIndex = index;
         while (index < last) {
           ch = source.charAt(index);
-          if (isLineTerminator(ch)) {
-            advance();
-          } else {
-            if (ch == '}') {
-              brace -= 1;
-              if (brace == 0) {
-                advance();
-                break;
-              }
-            } else if (ch == '{') {
-              brace += 1;
+          if (ch == '}') {
+            brace -= 1;
+            if (brace == 0) {
+              advance();
+              break;
             }
-            type.append(advance());
+          } else if (ch == '{') {
+            brace += 1;
           }
+          advance();
         }
 
         if (brace != 0) {
           // braces is not balanced
           return throwError("Braces are not balanced");
         }
 
+        // Get the type as a string, ignoring the last '}'
+        String type = source.substring(startIndex, index - 1);
+
         try {
           if (isParamTitle(title)) {
-            return typed.parseParamType(type.toString());
+            return typed.parseParamType(type);
           }
-          return typed.parseType(type.toString());
+          return typed.parseType(type);
         } catch (ParseError e) {
           // parse failed
           return null;