Fix angelozerr#121

Author: angelozerr

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/preferences/TypeScriptCorePreferenceInitializer.java

@@ -16,6 +16,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.osgi.service.prefs.BackingStoreException;
 
 import ts.cmd.tslint.TslintSettingsStrategy;
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
@@ -56,14 +57,18 @@ public void initializeDefaultPreferences() {
 				for (int i = 0; i < oldRepostoryBaseDirs.length; i++) {
 					oldRepostoryBaseDir = oldRepostoryBaseDirs[i];
 					if (oldRepostoryBaseDir.isDirectory()) {
-						TypeScriptCorePlugin.getTypeScriptRepositoryManager().createRepository(oldRepostoryBaseDir);
+						try {
+							TypeScriptCorePlugin.getTypeScriptRepositoryManager().createRepository(oldRepostoryBaseDir);
+						} catch (Exception e) {
+							Trace.trace(Trace.SEVERE, "Error while getting an archived TypeScript repository", e);
+						}
 					}
 				}
 
 			}
 
 			// Initialize tsc preferences
-			initializeTscPreferences(node, defaultRepository);
+			initializeTypeScriptRuntimePreferences(node, defaultRepository);
 			// Initialize tsserver preferences
 			initializeTsserverPreferences(node, defaultRepository);
 			// Initialize tslint preferences
@@ -82,6 +87,11 @@ public void initializeDefaultPreferences() {
 
 		// initialize editor+formation options
 		initializeEditorFormatOptions(node);
+
+		// Fix embedded TypeScript id preference
+		// See https://github.com/angelozerr/typescript.java/issues/121
+		fixEmbeddedTypeScriptIdPreference(
+				WorkspaceTypeScriptSettingsHelper.getWorkspacePreferences(TypeScriptCorePlugin.PLUGIN_ID));
 	}
 
 	/**
@@ -112,7 +122,8 @@ private static boolean useBundledNodeJsEmbedded(IEclipsePreferences node) {
 		return false;
 	}
 
-	private void initializeTscPreferences(IEclipsePreferences node, ITypeScriptRepository defaultRepository) {
+	private void initializeTypeScriptRuntimePreferences(IEclipsePreferences node,
+			ITypeScriptRepository defaultRepository) {
 		node.put(TypeScriptCorePreferenceConstants.EMBEDDED_TYPESCRIPT_ID, defaultRepository.getName());
 		node.putBoolean(TypeScriptCorePreferenceConstants.USE_EMBEDDED_TYPESCRIPT, true);
 		node.put(TypeScriptCorePreferenceConstants.INSTALLED_TYPESCRIPT_PATH, "");
@@ -171,4 +182,25 @@ private void initializeEditorFormatOptions(IEclipsePreferences node) {
 				TypeScriptCorePreferenceConstants.FORMAT_OPTIONS_PLACE_OPEN_BRACE_ON_NEW_LINE_FOR_CONTROL_BLOCKS_DEFAULT);
 
 	}
+
+	/**
+	 * Fix the embeddedTypeScriptId preference if needed with default
+	 * embeddedTypeScriptId.
+	 * 
+	 * @param preferences
+	 * @see https://github.com/angelozerr/typescript.java/issues/121
+	 */
+	public static void fixEmbeddedTypeScriptIdPreference(IEclipsePreferences preferences) {
+		String embeddedTypeScriptId = preferences.get(TypeScriptCorePreferenceConstants.EMBEDDED_TYPESCRIPT_ID, null);
+		if (embeddedTypeScriptId != null
+				&& TypeScriptCorePlugin.getTypeScriptRepositoryManager().getRepository(embeddedTypeScriptId) == null) {
+			preferences.put(TypeScriptCorePreferenceConstants.EMBEDDED_TYPESCRIPT_ID,
+					TypeScriptCorePlugin.getTypeScriptRepositoryManager().getDefaultRepository().getName());
+			try {
+				preferences.flush();
+			} catch (BackingStoreException e) {
+				Trace.trace(Trace.SEVERE, "Error while fixing embeddedTypeScriptId preference", e);
+			}
+		}
+	}
 }

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDETypeScriptProjectSettings.java

@@ -26,6 +26,7 @@
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProjectSettings;
 import ts.eclipse.ide.core.resources.buildpath.ITypeScriptBuildPath;
+import ts.eclipse.ide.internal.core.preferences.TypeScriptCorePreferenceInitializer;
 import ts.eclipse.ide.internal.core.repository.IDETypeScriptRepositoryManager;
 import ts.eclipse.ide.internal.core.resources.buildpath.TypeScriptBuildPath;
 import ts.nodejs.NodejsProcess;
@@ -48,6 +49,9 @@ public class IDETypeScriptProjectSettings extends AbstractTypeScriptSettings imp
 	public IDETypeScriptProjectSettings(IDETypeScriptProject tsProject) {
 		super(tsProject.getProject(), TypeScriptCorePlugin.PLUGIN_ID);
 		this.tsProject = tsProject;
+		// Fix embedded TypeScript id preference
+		// See https://github.com/angelozerr/typescript.java/issues/121
+		TypeScriptCorePreferenceInitializer.fixEmbeddedTypeScriptIdPreference(getProjectPreferences());
 	}
 
 	/**