Skip to content

Remove Global Registry NodeJs InstallDir fallback #1273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjbvz merged 1 commit into from
Sep 13, 2016
Merged

Remove Global Registry NodeJs InstallDir fallback #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 2 additions & 41 deletions Nodejs/Product/Nodejs/NodejsToolsInstallPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,65 +17,26 @@
using System;
using System.IO;
using System.Reflection;
using Microsoft.Win32;

namespace Microsoft.NodejsTools {
public static class NodejsToolsInstallPath {
private static string GetFromAssembly(Assembly assembly, string filename) {
string path = Path.Combine(
Path.GetDirectoryName(assembly.Location),
filename
);
filename);
if (File.Exists(path)) {
return path;
}
return string.Empty;
}

private static string GetFromRegistry(string filename) {
const string ROOT_KEY = "Software\\Microsoft\\NodejsTools\\" + AssemblyVersionInfo.VSVersion;

string installDir = null;
using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
using (var configKey = baseKey.OpenSubKey(ROOT_KEY)) {
if (configKey != null) {
installDir = configKey.GetValue("InstallDir") as string;
}
}

if (string.IsNullOrEmpty(installDir)) {
using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32))
using (var configKey = baseKey.OpenSubKey(ROOT_KEY)) {
if (configKey != null) {
installDir = configKey.GetValue("InstallDir") as string;
}
}
}

if (!String.IsNullOrEmpty(installDir)) {
var path = Path.Combine(installDir, filename);
if (File.Exists(path)) {
return path;
}
}

return string.Empty;
}

public static string GetFile(string filename) {
string path = GetFromAssembly(typeof(NodejsToolsInstallPath).Assembly, filename);
if (!string.IsNullOrEmpty(path)) {
return path;
}

path = GetFromRegistry(filename);
if (!string.IsNullOrEmpty(path)) {
return path;
}

throw new InvalidOperationException(
"Unable to determine Node.js Tools installation path"
);
throw new InvalidOperationException("Unable to determine Node.js Tools installation path");
}
}
}
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/Project/NodejsProjectNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,8 +1173,8 @@ protected override int ExecCommandThatDependsOnSelectedNodes(Guid cmdGroup, uint
);
handled = true;
return VSConstants.S_OK;
case PkgCmdId.cmdidAddNewJavaScriptFileCommand:

case PkgCmdId.cmdidAddNewJavaScriptFileCommand:
NewFileMenuGroup.NewFileUtilities.CreateNewJavaScriptFile(projectNode: this, containerId: selectedNodes[0].ID);
handled = true;
return VSConstants.S_OK;
Expand Down