move gcprofiler code (now in serve-d)

Author: WebFreak001

src/dmode.ts

@@ -6,4 +6,5 @@ export const DSCRIPT_MODE: vscode.DocumentFilter = { language: "dscript", scheme
 export const SDL_MODE: vscode.DocumentFilter = { language: "sdl", scheme: "file" };
 export const DUB_MODE: vscode.DocumentFilter = { pattern: "**/dub.{sdl,json}", scheme: "file" };
 export const DSCANNER_INI_MODE: vscode.DocumentFilter = { pattern: "**/dscanner.ini", scheme: "file" };
-export const DIET_MODE: vscode.DocumentFilter = { language: "diet", scheme: "file" };
+export const DIET_MODE: vscode.DocumentFilter = { language: "diet", scheme: "file" };
+export const PROFILEGC_MODE: vscode.DocumentFilter = { pattern: "**/profilegc.log", scheme: "file" };

src/extension.ts

@@ -210,13 +210,14 @@ function startClient(context: vscode.ExtensionContext) {
 	};
 	var outputChannel = vscode.window.createOutputChannel("code-d & serve-d");
 	let clientOptions: LanguageClientOptions = {
-		documentSelector: <DocumentFilter[]>[mode.D_MODE, mode.DUB_MODE, mode.DIET_MODE, mode.DML_MODE, mode.DSCANNER_INI_MODE],
+		documentSelector: <DocumentFilter[]>[mode.D_MODE, mode.DUB_MODE, mode.DIET_MODE, mode.DML_MODE, mode.DSCANNER_INI_MODE, mode.PROFILEGC_MODE],
 		synchronize: {
 			configurationSection: ["d", "dfmt", "dscanner", "editor", "git"],
 			fileEvents: [
 				vscode.workspace.createFileSystemWatcher("**/*.d"),
 				vscode.workspace.createFileSystemWatcher("**/dub.json"),
-				vscode.workspace.createFileSystemWatcher("**/dub.sdl")
+				vscode.workspace.createFileSystemWatcher("**/dub.sdl"),
+				vscode.workspace.createFileSystemWatcher("**/profilegc.log")
 			]
 		},
 		revealOutputChannelOn: RevealOutputChannelOn.Never,
@@ -412,24 +413,11 @@ export function activate(context: vscode.ExtensionContext): CodedAPI {
 
 	registerDebuggers(context);
 
-	if (vscode.workspace.workspaceFolders) {
-		{
-			let gcprofiler = new GCProfiler();
-			vscode.languages.registerCodeLensProvider(mode.D_MODE, gcprofiler);
-
-			let watcher = vscode.workspace.createFileSystemWatcher("**/profilegc.log", false, false, false);
-
-			watcher.onDidCreate(gcprofiler.updateProfileCache, gcprofiler, context.subscriptions);
-			watcher.onDidChange(gcprofiler.updateProfileCache, gcprofiler, context.subscriptions);
-			watcher.onDidDelete(gcprofiler.clearProfileCache, gcprofiler, context.subscriptions);
-			context.subscriptions.push(watcher);
-
-			let profileGCPath = path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "profilegc.log");
-			if (fs.existsSync(profileGCPath))
-				gcprofiler.updateProfileCache(vscode.Uri.file(profileGCPath));
+	{
+		context.subscriptions.push(vscode.commands.registerCommand("code-d.showGCCalls", GCProfiler.listProfileCache));
+	}
 
-			context.subscriptions.push(vscode.commands.registerCommand("code-d.showGCCalls", gcprofiler.listProfileCache, gcprofiler));
-		}
+	if (vscode.workspace.workspaceFolders) {
 		{
 			let coverageanal = new CoverageAnalyzer();
 			context.subscriptions.push(coverageanal);

src/gcprofiler.ts

@@ -1,86 +1,29 @@
 import * as vscode from "vscode";
-import * as fs from "fs";
-import * as path from "path";
-import { config } from "./extension";
-
-var spaces = /[^\S\n]+/g;
-var filelineRegex = /(\S+):(\d+)$/;
+import { served } from "./extension";
 
 interface ProfileQuickPick extends vscode.QuickPickItem {
-	profile: any;
+	uri: string;
+	line: number;
 }
 
-export class GCProfiler implements vscode.CodeLensProvider {
-	provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.CodeLens[] {
-		if (!config(document.uri).get("enableGCProfilerDecorations", true))
-			return [];
-
-		var lenses: vscode.CodeLens[] = [];
-		this.profiles.forEach(profile => {
-			if (document.uri.fsPath == vscode.Uri.parse(profile.file).fsPath) {
-				var lens = new vscode.CodeLens(document.lineAt(profile.line - 1).range);
-				lens.command = {
-					arguments: [],
-					command: "",
-					title: profile.bytesAllocated + " bytes allocated / " + profile.allocationCount + " allocations"
-				};
-				lenses.push(lens);
-			}
-		});
-		return lenses;
-	}
-
-	updateProfileCache(uri: vscode.Uri) {
-		var root = ".";
-		var workspace = vscode.workspace.getWorkspaceFolder(uri);
-		if (workspace)
-			root = workspace.uri.path;
-		fs.readFile(uri.fsPath, (err, data) => {
-			this.profiles = [];
-			var lines = data.toString("utf8").split("\n");
-			for (var i = 1; i < lines.length; i++) {
-				var cols = lines[i].trim().split(spaces);
-				if (cols.length < 5)
-					continue;
-				var fileLine = cols.slice(4, cols.length).join("");
-				var match = filelineRegex.exec(lines[i]);
-				if (match) {
-					var file = match[1];
-					var displayFile = file;
-					if (!path.isAbsolute(file))
-						file = path.join(root, file);
-					this.profiles.push({
-						bytesAllocated: cols[0],
-						allocationCount: cols[1],
-						type: cols[2],
-						file: file,
-						displayFile: displayFile,
-						line: parseInt(match[2])
-					});
-				}
-			}
-		});
-	}
+export class GCProfiler {
+	static listProfileCache() {
+		let entriesPromise = served.client.sendRequest<any[]>("served/getProfileGCEntries");
 
-	clearProfileCache() {
-		this.profiles = [];
-	}
+		let items: Thenable<ProfileQuickPick[]> = entriesPromise.then(gcEntries =>
+			gcEntries.map(entry => <ProfileQuickPick>{
+				description: entry.type,
+				detail: entry.bytesAllocated + " bytes allocated / " + entry.allocationCount + " allocations",
+				label: entry.displayFile + ":" + entry.line,
+				uri: entry.uri,
+				line: entry.line
+			}));
 
-	listProfileCache() {
-		let items: ProfileQuickPick[] = [];
-		this.profiles.forEach(profile => {
-			items.push({
-				description: profile.type,
-				detail: profile.bytesAllocated + " bytes allocated / " + profile.allocationCount + " allocations",
-				label: profile.displayFile + ":" + profile.line,
-				profile: profile
-			});
-		});
 		vscode.window.showQuickPick(items).then(item => {
 			if (item)
-				vscode.workspace.openTextDocument(vscode.Uri.file(item.profile.file)).then(doc => {
+				vscode.workspace.openTextDocument(vscode.Uri.parse(item.uri)).then(doc => {
 					vscode.window.showTextDocument(doc).then(editor => {
-						let line = doc.lineAt(item.profile.line - 1);
+						let line = doc.lineAt(item.line - 1);
 						editor.revealRange(line.range, vscode.TextEditorRevealType.InCenterIfOutsideViewport);
 						editor.selection = new vscode.Selection(line.range.start, line.range.start);
 					});