Param pathMapping

client/package.json

@@ -4,29 +4,28 @@
     "author": "renandelmonico",
     "license": "MIT",
     "version": "0.0.1",
-    "publisher": "renandelmonico",
+    "publisher": "satiromarra",
     "contributors": [
-        "recca0120"
+        "recca0120",
+        "renandelmonico"
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/renandelmonico/vscode-phpunit"
+        "url": "https://github.com/satiromarra/vscode-phpunit"
     },
     "engines": {
         "vscode": "^1.30.0"
     },
-    "scripts": {
-        "update-vscode": "vscode-install"
-    },
+    "scripts": {},
     "dependencies": {
-        "md5": "^2.3.0",
+        "md5": "^2.2.1",
         "vscode-languageclient": "^5.2.1",
-        "vscode-test-adapter-api": "^1.9.0",
-        "vscode-test-adapter-util": "^0.7.1"
+        "vscode-test-adapter-api": "^1.7.0",
+        "vscode-test-adapter-util": "^0.7.0"
     },
     "devDependencies": {
-        "@types/md5": "^2.3.1",
-        "diff": "^4.0.2",
-        "vscode": "^1.1.37"
+        "@types/md5": "^2.1.33",
+        "diff": "^4.0.1",
+        "@types/vscode": "^1.1.34"
     }
 }

client/src/LanguageClientAdapter.ts

@@ -3,163 +3,163 @@ import { Event, EventEmitter, WorkspaceFolder } from 'vscode';
 import { LanguageClient } from 'vscode-languageclient';
 import { Log } from 'vscode-test-adapter-util';
 import {
-    TestAdapter,
-    TestLoadStartedEvent,
-    TestLoadFinishedEvent,
-    TestRunStartedEvent,
-    TestRunFinishedEvent,
-    TestSuiteEvent,
-    TestEvent,
-    RetireEvent,
+	TestAdapter,
+	TestLoadStartedEvent,
+	TestLoadFinishedEvent,
+	TestRunStartedEvent,
+	TestRunFinishedEvent,
+	TestSuiteEvent,
+	TestEvent,
+	RetireEvent,
 } from 'vscode-test-adapter-api';
 
 export class LanguageClientAdapter implements TestAdapter {
-    private disposables: { dispose(): void }[] = [];
-
-    private readonly testsEmitter = new EventEmitter<
-        TestLoadStartedEvent | TestLoadFinishedEvent
-    >();
-
-    private readonly testStatesEmitter = new EventEmitter<
-        TestRunStartedEvent | TestRunFinishedEvent | TestSuiteEvent | TestEvent
-    >();
-
-    private readonly retireEmitter = new EventEmitter<RetireEvent>();
-
-    get tests(): Event<TestLoadStartedEvent | TestLoadFinishedEvent> {
-        return this.testsEmitter.event;
-    }
-
-    get testStates(): Event<
-        TestRunStartedEvent | TestRunFinishedEvent | TestSuiteEvent | TestEvent
-    > {
-        return this.testStatesEmitter.event;
-    }
-
-    get retire(): Event<RetireEvent> {
-        return this.retireEmitter.event;
-    }
-
-    constructor(
-        public workspaceFolder: WorkspaceFolder,
-        private client: LanguageClient,
-        private log: Log
-    ) {
-        this.onTestLoadStartedEvent();
-        this.onTestLoadFinishedEvent();
-        this.onTestRunStartedEvent();
-        this.onTestRunFinishedEvent();
-        this.onTestRetryEvent();
-
-        this.disposables.push(this.testsEmitter);
-        this.disposables.push(this.testStatesEmitter);
-        this.disposables.push(this.retireEmitter);
-    }
-
-    public requestName(name: string) {
-        return [name, md5(this.workspaceFolder.uri.toString())].join('-');
-    }
-
-    async load(): Promise<void> {
-        await this.client.onReady();
-
-        this.client.sendNotification(this.requestName('TestLoadStartedEvent'));
-    }
-
-    async run(tests: string[]): Promise<void> {
-        await this.client.onReady();
-
-        this.client.sendNotification(this.requestName('TestRunStartedEvent'), {
-            tests,
-        });
-    }
-
-    // debug?(tests: string[]): Promise<void> {
-    //     console.log(tests);
-    //     throw new Error('Method not implemented.');
-    // }
-
-    async cancel() {
-        await this.client.onReady();
-
-        this.client.sendNotification(this.requestName('TestCancelEvent'));
-    }
-
-    async dispose(): Promise<void> {
-        await this.cancel();
-        for (const disposable of this.disposables) {
-            disposable.dispose();
-        }
-        this.disposables = [];
-    }
-
-    private async onTestLoadStartedEvent() {
-        await this.client.onReady();
-
-        this.client.onRequest(this.requestName('TestLoadStartedEvent'), () =>
-            this.testsEmitter.fire(<TestLoadStartedEvent>{ type: 'started' })
-        );
-    }
-
-    private async onTestLoadFinishedEvent() {
-        await this.client.onReady();
-
-        this.client.onRequest(
-            this.requestName('TestLoadFinishedEvent'),
-            ({ suite }) => {
-                this.testsEmitter.fire(<TestLoadFinishedEvent>{
-                    type: 'finished',
-                    suite: suite,
-                });
-            }
-        );
-    }
-
-    private async onTestRunStartedEvent() {
-        await this.client.onReady();
-
-        this.client.onRequest(
-            this.requestName('TestRunStartedEvent'),
-            ({ tests, events }) => {
-                this.testStatesEmitter.fire(<TestRunStartedEvent>{
-                    type: 'started',
-                    tests,
-                });
-
-                this.updateEvents(events);
-            }
-        );
-    }
-
-    private async onTestRunFinishedEvent() {
-        await this.client.onReady();
-
-        this.client.onRequest(
-            this.requestName('TestRunFinishedEvent'),
-            ({ events, command }) => {
-                this.log.info(command);
-                this.updateEvents(events);
-
-                this.testStatesEmitter.fire(<TestRunFinishedEvent>{
-                    type: 'finished',
-                });
-            }
-        );
-    }
-
-    private async onTestRetryEvent() {
-        await this.client.onReady();
-
-        this.client.onRequest(this.requestName('TestRetryEvent'), () => {
-            this.retireEmitter.fire();
-        });
-    }
-
-    private updateEvents(events: (TestSuiteEvent | TestEvent)[]): void {
-        events.forEach(event => {
-            event.type === 'suite'
-                ? this.testStatesEmitter.fire(<TestSuiteEvent>event)
-                : this.testStatesEmitter.fire(<TestEvent>event);
-        });
-    }
+	private disposables: { dispose(): void }[] = [];
+
+	private readonly testsEmitter = new EventEmitter<
+		TestLoadStartedEvent | TestLoadFinishedEvent
+	>();
+
+	private readonly testStatesEmitter = new EventEmitter<
+		TestRunStartedEvent | TestRunFinishedEvent | TestSuiteEvent | TestEvent
+	>();
+
+	private readonly retireEmitter = new EventEmitter<RetireEvent>();
+
+	get tests(): Event<TestLoadStartedEvent | TestLoadFinishedEvent> {
+		return this.testsEmitter.event;
+	}
+
+	get testStates(): Event<
+		TestRunStartedEvent | TestRunFinishedEvent | TestSuiteEvent | TestEvent
+	> {
+		return this.testStatesEmitter.event;
+	}
+
+	get retire(): Event<RetireEvent> {
+		return this.retireEmitter.event;
+	}
+
+	constructor(
+		public workspaceFolder: WorkspaceFolder,
+		private client: LanguageClient,
+		private log: Log
+	) {
+		this.onTestLoadStartedEvent();
+		this.onTestLoadFinishedEvent();
+		this.onTestRunStartedEvent();
+		this.onTestRunFinishedEvent();
+		this.onTestRetryEvent();
+
+		this.disposables.push(this.testsEmitter);
+		this.disposables.push(this.testStatesEmitter);
+		this.disposables.push(this.retireEmitter);
+	}
+
+	public requestName(name: string) {
+		return [name, md5(this.workspaceFolder.uri.toString())].join('-');
+	}
+
+	async load(): Promise<void> {
+		await this.client.onReady();
+
+		this.client.sendNotification(this.requestName('TestLoadStartedEvent'));
+	}
+
+	async run(tests: string[]): Promise<void> {
+		await this.client.onReady();
+
+		this.client.sendNotification(this.requestName('TestRunStartedEvent'), {
+			tests,
+		});
+	}
+
+	// debug?(tests: string[]): Promise<void> {
+	//     console.log(tests);
+	//     throw new Error('Method not implemented.');
+	// }
+
+	async cancel() {
+		await this.client.onReady();
+
+		this.client.sendNotification(this.requestName('TestCancelEvent'));
+	}
+
+	async dispose(): Promise<void> {
+		await this.cancel();
+		for (const disposable of this.disposables) {
+			disposable.dispose();
+		}
+		this.disposables = [];
+	}
+
+	private async onTestLoadStartedEvent() {
+		await this.client.onReady();
+
+		this.client.onRequest(this.requestName('TestLoadStartedEvent'), () =>
+			this.testsEmitter.fire(<TestLoadStartedEvent>{ type: 'started' })
+		);
+	}
+
+	private async onTestLoadFinishedEvent() {
+		await this.client.onReady();
+
+		this.client.onRequest(
+			this.requestName('TestLoadFinishedEvent'),
+			({ suite }) => {
+				this.testsEmitter.fire(<TestLoadFinishedEvent>{
+					type: 'finished',
+					suite: suite,
+				});
+			}
+		);
+	}
+
+	private async onTestRunStartedEvent() {
+		await this.client.onReady();
+
+		this.client.onRequest(
+			this.requestName('TestRunStartedEvent'),
+			({ tests, events }) => {
+				this.testStatesEmitter.fire(<TestRunStartedEvent>{
+					type: 'started',
+					tests,
+				});
+
+				this.updateEvents(events);
+			}
+		);
+	}
+
+	private async onTestRunFinishedEvent() {
+		await this.client.onReady();
+
+		this.client.onRequest(
+			this.requestName('TestRunFinishedEvent'),
+			({ events, command }) => {
+				this.log.info(command);
+				this.updateEvents(events);
+
+				this.testStatesEmitter.fire(<TestRunFinishedEvent>{
+					type: 'finished',
+				});
+			}
+		);
+	}
+
+	private async onTestRetryEvent() {
+		await this.client.onReady();
+
+		this.client.onRequest(this.requestName('TestRetryEvent'), (data) => {
+			this.retireEmitter.fire(<RetireEvent>data);
+		});
+	}
+
+	private updateEvents(events: (TestSuiteEvent | TestEvent)[]): void {
+		events.forEach(event => {
+			event.type === 'suite'
+				? this.testStatesEmitter.fire(<TestSuiteEvent>event)
+				: this.testStatesEmitter.fire(<TestEvent>event);
+		});
+	}
 }

client/tsconfig.json

@@ -1,13 +1,13 @@
 {
-    "extends": "../tsconfig.base.json",
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "strict": true,
-        "outDir": "out",
-        "rootDir": "src",
-        "sourceMap": true
-    },
-    "include": ["src"],
-    "exclude": ["node_modules", "__mocks__"]
-}
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es2017",
+		"strict": true,
+		"outDir": "out",
+		"rootDir": "src",
+		"sourceMap": true
+	},
+	"include": ["src"],
+	"exclude": ["node_modules", "__mocks__"]
+}