@@ -15,7 +15,7 @@
         "out": true // set this to false to include "out" folder in search results
     },
     "[java]": {
-        "editor.formatOnSave": false
+        "editor.formatOnSave": true
     },
     "java.trace.server": "messages"
 }
@@ -53,8 +53,8 @@ public String visitDeclared(DeclaredType t, Void aVoid) {
             result += "<" + params + ">";
         }
 
-        if (result.startsWith("java.lang.")) return result.substring("java.lang.".length());
-        else if (result.startsWith("java.util.")) return result.substring("java.util.".length());
+        if (result.matches("java\\.lang\\.\\w+")) return result.substring("java.lang.".length());
+        else if (result.startsWith("java\\.util\\.\\w+")) return result.substring("java.util.".length());
         else return result;
     }
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"out": true // set this to false to include "out" folder in search results`
`16`	`16`	`},`
`17`	`17`	`"[java]": {`
`18`		`- "editor.formatOnSave": false`
	`18`	`+ "editor.formatOnSave": true`
`19`	`19`	`},`
`20`	`20`	`"java.trace.server": "messages"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public String visitDeclared(DeclaredType t, Void aVoid) {`
`53`	`53`	`result += "<" + params + ">";`
`54`	`54`	`}`
`55`	`55`
`56`		`- if (result.startsWith("java.lang.")) return result.substring("java.lang.".length());`
`57`		`- else if (result.startsWith("java.util.")) return result.substring("java.util.".length());`
	`56`	`+ if (result.matches("java\\.lang\\.\\w+")) return result.substring("java.lang.".length());`
	`57`	`+ else if (result.startsWith("java\\.util\\.\\w+")) return result.substring("java.util.".length());`
`58`	`58`	`else return result;`
`59`	`59`	`}`
`60`	`60`