Use separate cache directory for each project / target (#201)

Author: nobodywasishere

src/definitions.ts

@@ -115,6 +115,6 @@ async function spawnImplTool(
 	crystalOutputChannel.appendLine(`[Implementations] (${folder.name}) $ ${cmd}`);
 
 	return JSON.parse(
-		await execAsync(cmd, folder.uri.fsPath)
+		await execAsync(cmd, folder.uri.fsPath, `crystal-${folder.name}-${path.basename(main)}`)
 	);
 }

src/hover.ts

@@ -276,7 +276,7 @@ async function spawnContextTool(
 
 	crystalOutputChannel.appendLine(`[Context] (${folder.name}) $ ${cmd}`);
 
-	return await execAsync(cmd, folder.uri.fsPath)
+	return await execAsync(cmd, folder.uri.fsPath, `crystal-${folder.name}-${path.basename(main)}`)
 		.then((response) => {
 			findProblems(response, document.uri);
 			return JSON.parse(response);

src/macro.ts

@@ -1,5 +1,6 @@
 import { Position, TextDocument, commands, window, workspace } from 'vscode';
 import { crystalOutputChannel, execAsync, findProblems, getCompilerPath, getCursorPath, getShardMainPath, getWorkspaceFolder, shellEscape } from './tools';
+import path = require('path');
 
 export const macroOutputChannel = window.createOutputChannel("Crystal Macro", "markdown")
 
@@ -39,13 +40,13 @@ export async function spawnMacroExpandTool(document: TextDocument, position: Pos
   const cmd = `${shellEscape(compiler)} tool expand ${shellEscape(main)} --cursor ${shellEscape(cursor)} ${config.get<string>("flags")}`
 
   crystalOutputChannel.appendLine(`[Macro Expansion] (${folder.name}) $ ` + cmd)
-  return await execAsync(cmd, folder.uri.fsPath)
+  return await execAsync(cmd, folder.uri.fsPath, `crystal-${folder.name}-${path.basename(main)}`)
     .then((response) => {
       return response;
     })
     .catch(async (err) => {
       const new_cmd = cmd + ' -f json'
-      await execAsync(new_cmd, folder.uri.fsPath)
+      await execAsync(new_cmd, folder.uri.fsPath, `crystal-${folder.name}-${path.basename(main)}`)
         .catch((err) => {
           findProblems(err.stderr, document.uri)
           crystalOutputChannel.appendLine(`[Macro Expansion] Error: ${err.message}`)

src/problems.ts

@@ -1,5 +1,6 @@
 import { TextDocument, workspace } from "vscode";
 import { setStatusBar, compiler_mutex, crystalOutputChannel, diagnosticCollection, execAsync, findProblems, getCompilerPath, getShardMainPath, getWorkspaceFolder, shellEscape } from "./tools";
+import path = require("path");
 
 export function registerProblems(): void {
   workspace.onDidOpenTextDocument((e) => handleDocument(e))
@@ -42,7 +43,7 @@ export async function spawnProblemsTool(document: TextDocument, mainFile: string
   const main = mainFile || await getShardMainPath(document);
   if (!main) return;
 
-  const folder = getWorkspaceFolder(document.uri).uri.fsPath;
+  const folder = getWorkspaceFolder(document.uri);
   const config = workspace.getConfiguration('crystal-lang');
 
   // If document is in a folder of the same name as the document, it will throw an
@@ -56,7 +57,7 @@ export async function spawnProblemsTool(document: TextDocument, mainFile: string
   const cmd = `${shellEscape(compiler)} build ${shellEscape(main)} --no-debug --no-color --no-codegen --error-trace -f json -o ${output} ${config.get<string>("flags")}`
 
   crystalOutputChannel.appendLine(`[Problems] (${getWorkspaceFolder(document.uri).name}) $ ` + cmd)
-  await execAsync(cmd, folder)
+  await execAsync(cmd, folder.uri.fsPath, `crystal-${folder.name}-${path.basename(main)}`)
     .then((response) => {
       diagnosticCollection.clear()
       crystalOutputChannel.appendLine("[Problems] No problems found.")

src/spec.ts

@@ -377,7 +377,7 @@ export async function spawnSpecTool(
   }
   crystalOutputChannel.appendLine(`[Spec] (${space.name}) $ ` + cmd);
 
-  await execAsync(cmd, space.uri.fsPath).catch((err) => {
+  await execAsync(cmd, space.uri.fsPath, `crystal-${path.basename(space.uri.fsPath)}-specs`).catch((err) => {
     if (err.stderr) {
       findProblems(err.stderr, space.uri)
     } else if (err.message) {

src/tools.ts

@@ -7,6 +7,7 @@ import * as yaml from 'yaml';
 import { cwd } from 'process';
 import { Mutex } from 'async-mutex';
 import { spawnProblemsTool } from './problems';
+import { homedir } from 'os';
 
 export const crystalOutputChannel = window.createOutputChannel("Crystal", "log")
 
@@ -27,6 +28,7 @@ export const compiler_mutex: Mutex = new Mutex();
 function execWrapper(
 	command: string,
 	cwd: string,
+	target: string | null,
 	callback?: (
 		error: (ExecException & { stdout: string; stderr: string }) | {},
 		stdout: string,
@@ -40,6 +42,15 @@ function execWrapper(
 		env['GC_DONT_GC'] = '1'
 	}
 
+	// Don't want to interfere with the global cache
+	if (target) {
+		const cache_dir = env['XDG_CACHE_HOME'] ||
+			(homedir() ? path.join(homedir(), '.cache') : undefined) ||
+			path.join(cwd, '.crystal');
+
+		env['CRYSTAL_CACHE_DIR'] = path.join(cache_dir, target)
+	}
+
 	const response = exec(command, { 'cwd': cwd, env }, (err, stdout, stderr) => {
 		if (err) {
 			callback({ ...err, stderr, stdout }, stdout, stderr);
@@ -83,7 +94,7 @@ export async function getCompilerPath(): Promise<string> {
 	const command =
 		(process.platform === 'win32' ? 'where' : 'which') + ' crystal';
 
-	return (await execAsync(command, process.cwd())).trim();
+	return (await execAsync(command, process.cwd(), null)).trim();
 }
 
 /**
@@ -103,7 +114,7 @@ export async function getShardsPath(): Promise<string> {
 	const command =
 		(process.platform === 'win32' ? 'where' : 'which') + ' shards';
 
-	return (await execAsync(command, process.cwd())).trim();
+	return (await execAsync(command, process.cwd(), null)).trim();
 }
 
 /**
@@ -266,7 +277,7 @@ export async function getShardMainPath(document: TextDocument): Promise<string>
  */
 export async function getCrystalLibPath(): Promise<string> {
 	const compiler = await getCompilerPath();
-	const libpath = await execAsync(`${compiler} env CRYSTAL_PATH`, process.cwd());
+	const libpath = await execAsync(`${compiler} env CRYSTAL_PATH`, process.cwd(), null);
 
 	return libpath.replace(/^lib[:;]|(?:\r)?\n/g, '');
 }
@@ -317,7 +328,7 @@ export interface SemVer {
 export async function getCrystalVersion(): Promise<SemVer> {
 	const compiler = await getCompilerPath();
 	const cmd = `${shellEscape(compiler)} --version`
-	const response = await execAsync(cmd, cwd())
+	const response = await execAsync(cmd, cwd(), null)
 
 	const match = response.match(/Crystal (\d+)\.(\d+)\.(\d+)/)
 
@@ -501,7 +512,7 @@ export async function getShardTargetForFile(document: TextDocument): Promise<{ r
 		crystalOutputChannel.appendLine(`[Dependencies] ${space.name} $ ${cmd}`)
 		const targetDocument = await workspace.openTextDocument(Uri.parse(targetPath))
 
-		const result = await execAsync(cmd, space.uri.fsPath)
+		const result = await execAsync(cmd, space.uri.fsPath, null)
 			.then((resp) => {
 				return { response: resp, error: undefined };
 			})