Merge pull request #15 from jesperbjensen/configuration-and-parser-hinting

Configuration and parser hinting

Author: madskristensen

src/Commands/CommandRegistration.cs

@@ -35,7 +35,7 @@ public async void VsTextViewCreated(IVsTextView textViewAdapter)
  ITextBufferUndoManager undoManager = UndoProvider.GetTextBufferUndoManager(view.TextBuffer);
  NodeProcess node = view.Properties.GetOrCreateSingletonProperty(() => new NodeProcess());
 
- AddCommandFilter(textViewAdapter, new PrettierCommand(view, undoManager, node, doc.Encoding));
+ AddCommandFilter(textViewAdapter, new PrettierCommand(view, undoManager, node, doc.Encoding, doc.FilePath));
 
  if (!node.IsReadyToExecute())
  {

src/Commands/PrettierCommand.cs

@@ -21,13 +21,15 @@ internal sealed class PrettierCommand : BaseCommand
  private ITextBufferUndoManager _undoManager;
  private NodeProcess _node;
  private Encoding _encoding;
+ private string _filePath;
 
- public PrettierCommand(IWpfTextView view, ITextBufferUndoManager undoManager, NodeProcess node, Encoding encoding)
+ public PrettierCommand(IWpfTextView view, ITextBufferUndoManager undoManager, NodeProcess node, Encoding encoding, string filePath)
  {
  _view = view;
  _undoManager = undoManager;
  _node = node;
  _encoding = encoding;
+ _filePath = filePath;
  }
 
  public override int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut)
@@ -48,7 +50,7 @@ public override int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt,
  private async Task<bool> MakePrettier()
  {
  string input = _view.TextBuffer.CurrentSnapshot.GetText();
- string output = await _node.ExecuteProcess(input, _encoding);
+ string output = await _node.ExecuteProcess(input, _encoding, _filePath);
 
  if (string.IsNullOrEmpty(output) || input == output)
  return false;
@@ -58,10 +60,7 @@ private async Task<bool> MakePrettier()
  {
  edit.Replace(0, _view.TextBuffer.CurrentSnapshot.Length, output);
  edit.Apply();
-
- var dte = (DTE)ServiceProvider.GlobalProvider.GetService(typeof(DTE));
- dte.ExecuteCommand("Edit.FormatDocument");
-
+ 
  undo.Complete();
  }
 

src/NodeProcess.cs

@@ -8,7 +8,7 @@ namespace JavaScriptPrettier
 {
  internal class NodeProcess
  {
- public const string Packages = "prettier@1.4.2";
+ public const string Packages = "prettier@1.8.2";
 
  private static string _installDir = Path.Combine(Path.GetTempPath(), Vsix.Name, Packages.GetHashCode().ToString());
  private static string _executable = Path.Combine(_installDir, "node_modules\\.bin\\prettier.cmd");
@@ -80,12 +80,14 @@ public async Task<bool> EnsurePackageInstalled()
  }
  }
 
- public async Task<string> ExecuteProcess(string input, Encoding encoding)
+ public async Task<string> ExecuteProcess(string input, Encoding encoding, string filePath)
  {
  if (!await EnsurePackageInstalled())
  return null;
 
- var start = new ProcessStartInfo("cmd", $"/c \"{_executable}\" --stdin")
+ var command = $"/c \"\"{_executable}\" --stdin-filepath \"{filePath}\" --stdin\"";
+
+ var start = new ProcessStartInfo("cmd", command)
  {
  UseShellExecute = false,
  CreateNoWindow = true,