Support for Angular CLI 1.5. See

angelozerr · angelozerr · commit 08b89002a368 · 2017-11-06T18:12:02.000+01:00
#64
diff --git a/ts.eclipse.ide.angular.cli/src/ts/eclipse/ide/angular/cli/utils/CLIProcessHelper.java b/ts.eclipse.ide.angular.cli/src/ts/eclipse/ide/angular/cli/utils/CLIProcessHelper.java
@@ -34,7 +34,8 @@ public class CLIProcessHelper {
 
 	public static final String NG_FILENAME = "ng";
 
-	private static final String ANGULAR_CLI = "@angular/cli:";
+	private static final String OLD_ANGULAR_CLI = "@angular/cli:";
+	private static final String NEW_ANGULAR_CLI = "Angular CLI:";
 
 	public static File findNg() {
 		return findNg(OSHelper.getOs());
@@ -86,9 +87,13 @@ public static String getNgVersion(File ngFile, File nodeFile) throws IOException
 				reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
 				String line;
 				while ((line = reader.readLine()) != null) {
-					int index = line.indexOf(ANGULAR_CLI);
+					int index = line.indexOf(OLD_ANGULAR_CLI);
 					if (index != -1) {
-						return line.substring(index + ANGULAR_CLI.length()).trim();
+						return line.substring(index + OLD_ANGULAR_CLI.length()).trim();
+					} else
+						index = line.indexOf(NEW_ANGULAR_CLI);
+					if (index != -1) {
+						return line.substring(index + NEW_ANGULAR_CLI.length()).trim();
 					}
 				}
 				return null;
diff --git a/ts.eclipse.ide.angular.cli/src/ts/eclipse/ide/angular/internal/cli/terminal/NgGenerateCommandInterpreter.java b/ts.eclipse.ide.angular.cli/src/ts/eclipse/ide/angular/internal/cli/terminal/NgGenerateCommandInterpreter.java
@@ -56,8 +56,15 @@ public void onTrace(String line) {
 			fileNames.add("");
 		} else {
 			if (!fileNames.isEmpty()) {
-				int index = fileNames.size() - 1;
-				fileNames.set(index, fileNames.get(index) + line.trim());
+				int index = fileNames.size() - 1;				
+				String name = fileNames.get(index) + line.trim();
+				// in angular cli 1.5, we have
+				// create src/app/y.ts (19 bytes), we need to remove the (
+				int bracket = name.indexOf("(");
+				if (bracket != -1) {
+					name = name.substring(0,  bracket).trim();
+				}
+				fileNames.set(index, name);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,15 @@ public void onTrace(String line) {`
`56`	`56`	`fileNames.add("");`
`57`	`57`	`} else {`
`58`	`58`	`if (!fileNames.isEmpty()) {`
`59`		`- int index = fileNames.size() - 1;`
`60`		`- fileNames.set(index, fileNames.get(index) + line.trim());`
	`59`	`+ int index = fileNames.size() - 1;`
	`60`	`+ String name = fileNames.get(index) + line.trim();`
	`61`	`+ // in angular cli 1.5, we have`
	`62`	`+ // create src/app/y.ts (19 bytes), we need to remove the (`
	`63`	`+ int bracket = name.indexOf("(");`
	`64`	`+ if (bracket != -1) {`
	`65`	`+ name = name.substring(0, bracket).trim();`
	`66`	`+ }`
	`67`	`+ fileNames.set(index, name);`
`61`	`68`	`}`
`62`	`69`	`}`
`63`	`70`	`}`