Update VSCode extension to use stdin-filepath and respect-ignores (#913)

Author: JohnnyMorganz

stylua-vscode/CHANGELOG.md

@@ -11,6 +11,11 @@ To view the changelog of the StyLua binary, see [here](https://github.com/Johnny
 
 ## [Unreleased]
 
+### Changed
+
+- The VSCode extension will now defer to using `stylua` itself to determine ignores and other configuration, rather than rolling its own ignore system
+- The VSCode extension now passes `--stdin-filepath` and `--respect-ignores` to the command line
+
 ## [1.6.3] - 2024-01-06
 
 ### Fixed

stylua-vscode/package-lock.json

@@ -166,7 +166,6 @@
     "webpack-cli": "^4.9.2"
   },
   "dependencies": {
-    "ignore": "^5.1.8",
     "node-fetch": "^2.6.1",
     "semver": "^7.5.4",
     "unzipper": "^0.10.14",

stylua-vscode/package.json

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import * as semver from "semver";
-import { formatCode, checkIgnored } from "./stylua";
+import { formatCode } from "./stylua";
 import { GitHub, GitHubRelease } from "./github";
 import { ResolveMode, StyluaDownloader, StyluaInfo } from "./download";
 import { getDesiredVersion } from "./util";
@@ -241,16 +241,14 @@ export async function activate(context: vscode.ExtensionContext) {
         );
         const cwd = currentWorkspace?.uri?.fsPath;
 
-        if (await checkIgnored(document.uri, currentWorkspace?.uri)) {
-          return [];
-        }
-
         const text = document.getText();
 
         try {
           const formattedText = await formatCode(
+            outputChannel,
             styluaBinaryPath.path,
             text,
+            document.uri.fsPath,
             cwd,
             byteOffset(document, range.start),
             byteOffset(document, range.end)

stylua-vscode/src/extension.ts

@@ -1,42 +1,23 @@
 import * as vscode from "vscode";
 import { spawn, exec } from "child_process";
-import ignore from "ignore";
-import { fileExists } from "./util";
-
-export async function checkIgnored(
-  filePath?: vscode.Uri,
-  currentWorkspace?: vscode.Uri
-): Promise<boolean> {
-  if (!filePath || !currentWorkspace) {
-    return false;
-  }
-
-  const ignoreFilePath = vscode.Uri.joinPath(currentWorkspace, ".styluaignore");
-  if (await fileExists(ignoreFilePath)) {
-    try {
-      const contents = await vscode.workspace.fs.readFile(ignoreFilePath);
-      const ig = ignore().add(contents.toString());
-      return ig.ignores(vscode.workspace.asRelativePath(filePath));
-    } catch (err) {
-      vscode.window.showErrorMessage(
-        `Could not read StyLua ignore file at ${ignoreFilePath}:\n${err}`
-      );
-      return false;
-    }
-  }
-
-  return false;
-}
 
 export function formatCode(
+  outputChannel: vscode.LogOutputChannel,
   path: string,
   code: string,
+  filePath?: string,
   cwd?: string,
   startPos?: number,
   endPos?: number
 ): Promise<string> {
   return new Promise((resolve, reject) => {
-    const args = [];
+    const args = ["--respect-ignores"];
+
+    if (filePath) {
+      args.push("--stdin-filepath");
+      args.push(filePath);
+    }
+
     if (startPos) {
       args.push("--range-start");
       args.push(startPos.toString());
@@ -65,6 +46,8 @@ export function formatCode(
 
     args.push("-");
 
+    outputChannel.debug(`${path} {args.join(" ")}`);
+
     const child = spawn(`${path}`, args, {
       cwd,
     });