diff --git a/Nodejs/Product/Nodejs/NodejsPackage.cs b/Nodejs/Product/Nodejs/NodejsPackage.cs index 55a9518dc..a4d76460d 100644 --- a/Nodejs/Product/Nodejs/NodejsPackage.cs +++ b/Nodejs/Product/Nodejs/NodejsPackage.cs @@ -256,7 +256,11 @@ protected override void Initialize() { public static LANGPREFERENCES3[] GetNodejsLanguagePreferencesFromTypeScript(IVsTextManager4 textMgr) { var langPrefs = new LANGPREFERENCES3[1]; langPrefs[0].guidLang = Guids.TypeScriptLanguageInfo; - ErrorHandler.ThrowOnFailure(textMgr.GetUserPreferences4(null, langPrefs, null)); + int hr = textMgr.GetUserPreferences4(null, langPrefs, null); + if (ErrorHandler.Failed(hr)) { + MessageBox.Show(Project.SR.GetString(Project.SR.CouldNotGetTypeScriptLanguagePreferences), Project.SR.ProductName); + ErrorHandler.ThrowOnFailure(hr); + } langPrefs[0].guidLang = typeof(NodejsLanguageInfo).GUID; textMgr.SetUserPreferences4(null, langPrefs, null); return langPrefs; diff --git a/Nodejs/Product/Nodejs/Project/ProjectResources.cs b/Nodejs/Product/Nodejs/Project/ProjectResources.cs index e64906db9..7baa5a599 100644 --- a/Nodejs/Product/Nodejs/Project/ProjectResources.cs +++ b/Nodejs/Product/Nodejs/Project/ProjectResources.cs @@ -34,6 +34,7 @@ internal class SR : CommonSR { internal const string CacheDirectoryClearFailedTitle = "CacheDirectoryClearFailedTitle"; internal const string CacheDirectoryClearFailedCaption = "CacheDirectoryClearFailedCaption"; internal const string ContinueWithoutAzureToolsUpgrade = "ContinueWithoutAzureToolsUpgrade"; + internal const string CouldNotGetTypeScriptLanguagePreferences = "CouldNotGetTypeScriptLanguagePreferences"; internal const string DebuggerConnectionClosed = "DebuggerConnectionClosed"; internal const string DebuggerModuleUpdateFailed = "DebuggerModuleUpdateFailed"; internal const string DebuggerPort = "DebuggerPort"; diff --git a/Nodejs/Product/Nodejs/Resources.resx b/Nodejs/Product/Nodejs/Resources.resx index d2935891b..de03c6f9e 100644 --- a/Nodejs/Product/Nodejs/Resources.resx +++ b/Nodejs/Product/Nodejs/Resources.resx @@ -627,4 +627,7 @@ You will need to restart Visual Studio after installation. Could not start Typings tool used for IntelliSense + + Could not retrieve Typescript language preferences. NTVS is not able to load. Please ensure Typescript is properly installed. + \ No newline at end of file