Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove terminal link matchers #98182

Merged
merged 11 commits into from
May 20, 2020
+37 −521
Merged

Remove terminal link matchers #98182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f5568c9
Remove link matchers from terminal
Tyriar May 15, 2020
3f27e51
Fix test instantiation conflict
Tyriar May 15, 2020
d01deed
Remove unused interface
Tyriar May 15, 2020
1b9576f
Merge remote-tracking branch 'origin/master' into tyriar/96266
Tyriar May 19, 2020
48ca7c9
Correct unit test suite name
Tyriar May 19, 2020
643b987
Fix TerminalLinkManager tests
Tyriar May 19, 2020
9a7a2dd
Merge remote-tracking branch 'origin/master' into tyriar/96266
Tyriar May 20, 2020
b293be4
Remove web links addon
Tyriar May 20, 2020
fdd075e
Remove web links addon
Tyriar May 20, 2020
94b5b54
Update distro
Tyriar May 20, 2020
1d44380
Remove xterm-addon-web-links package
Tyriar May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.46.0",
"distro": "fee0da8fdb72dec6cd3a0b868bcc930928133a96",
"distro": "64a6a85a3b1af4e177210fa8c72b822322b129ab",
"author": {
"name": "Microsoft Corporation"
},
Expand Down Expand Up @@ -63,7 +63,6 @@
"xterm": "4.7.0-beta.3",
"xterm-addon-search": "0.7.0",
"xterm-addon-unicode11": "0.2.0",
"xterm-addon-web-links": "0.4.0",
"xterm-addon-webgl": "0.7.0",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
Expand Down
1 change: 0 additions & 1 deletion remote/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"xterm": "4.7.0-beta.3",
"xterm-addon-search": "0.7.0",
"xterm-addon-unicode11": "0.2.0",
"xterm-addon-web-links": "0.4.0",
"xterm-addon-webgl": "0.7.0",
"yauzl": "^2.9.2",
"yazl": "^2.4.3"
Expand Down
1 change: 0 additions & 1 deletion remote/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"xterm": "4.7.0-beta.3",
"xterm-addon-search": "0.7.0",
"xterm-addon-unicode11": "0.2.0",
"xterm-addon-web-links": "0.4.0",
"xterm-addon-webgl": "0.7.0"
}
}
5 changes: 0 additions & 5 deletions remote/web/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c"
integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q==

[email protected]:
version "0.4.0"
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz#265cbf8221b9b315d0a748e1323bee331cd5da03"
integrity sha512-xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg==

[email protected]:
version "0.7.0"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0.tgz#a13732ac937170e53ce02ec91963da042c80614b"
Expand Down
5 changes: 0 additions & 5 deletions remote/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c"
integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q==

[email protected]:
version "0.4.0"
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.4.0.tgz#265cbf8221b9b315d0a748e1323bee331cd5da03"
integrity sha512-xv8GeiINmx0zENO9hf5k+5bnkaE8mRzF+OBAr9WeFq2eLaQSudioQSiT34M1ofKbzcdjSsKiZm19Rw3i4eXamg==

[email protected]:
version "0.7.0"
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.7.0.tgz#a13732ac937170e53ce02ec91963da042c80614b"
Expand Down
1 change: 0 additions & 1 deletion src/vs/code/browser/workbench/workbench-dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
'xterm': `${window.location.origin}/static/remote/web/node_modules/xterm/lib/xterm.js`,
'xterm-addon-search': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
'xterm-addon-unicode11': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
'xterm-addon-web-links': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
'xterm-addon-webgl': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
'semver-umd': `${window.location.origin}/static/remote/web/node_modules/semver-umd/lib/semver-umd.js`,
}
Expand Down
1 change: 0 additions & 1 deletion src/vs/code/browser/workbench/workbench.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
'xterm': `${window.location.origin}/static/node_modules/xterm/lib/xterm.js`,
'xterm-addon-search': `${window.location.origin}/static/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
'xterm-addon-unicode11': `${window.location.origin}/static/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
'xterm-addon-web-links': `${window.location.origin}/static/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
'xterm-addon-webgl': `${window.location.origin}/static/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
'semver-umd': `${window.location.origin}/static/node_modules/semver-umd/lib/semver-umd.js`,
}
Expand Down
37 changes: 0 additions & 37 deletions src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,6 @@ export class TerminalTaskSystem implements ITaskSystem {
// The process never got ready. Need to think how to handle this.
});
this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Start, task, terminal.id));
const registeredLinkMatchers = this.registerLinkMatchers(terminal, problemMatchers);
let skipLine: boolean = (!!task.command.presentation && task.command.presentation.echo);
const onData = terminal.onLineData((line) => {
if (skipLine) {
Expand Down Expand Up @@ -770,7 +769,6 @@ export class TerminalTaskSystem implements ITaskSystem {
}
watchingProblemMatcher.done();
watchingProblemMatcher.dispose();
registeredLinkMatchers.forEach(handle => terminal!.deregisterLinkMatcher(handle));
if (!processStartedSignaled) {
this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessStarted, task, terminal!.processId!));
processStartedSignaled = true;
Expand Down Expand Up @@ -813,7 +811,6 @@ export class TerminalTaskSystem implements ITaskSystem {
this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.Active, task));
let problemMatchers = this.resolveMatchers(resolver, task.configurationProperties.problemMatchers);
let startStopProblemMatcher = new StartStopProblemCollector(problemMatchers, this.markerService, this.modelService, ProblemHandlingStrategy.Clean, this.fileService);
const registeredLinkMatchers = this.registerLinkMatchers(terminal, problemMatchers);
let skipLine: boolean = (!!task.command.presentation && task.command.presentation.echo);
const onData = terminal.onLineData((line) => {
if (skipLine) {
Expand Down Expand Up @@ -852,11 +849,6 @@ export class TerminalTaskSystem implements ITaskSystem {
}
startStopProblemMatcher.done();
startStopProblemMatcher.dispose();
registeredLinkMatchers.forEach(handle => {
if (terminal) {
terminal.deregisterLinkMatcher(handle);
}
});
if (!processStartedSignaled && terminal) {
this._onDidStateChange.fire(TaskEvent.create(TaskEventKind.ProcessStarted, task, terminal.processId!));
processStartedSignaled = true;
Expand Down Expand Up @@ -1477,35 +1469,6 @@ export class TerminalTaskSystem implements ITaskSystem {
return result;
}

private registerLinkMatchers(terminal: ITerminalInstance, problemMatchers: ProblemMatcher[]): number[] {
let result: number[] = [];
/*
let handlePattern = (matcher: ProblemMatcher, pattern: ProblemPattern): void => {
if (pattern.regexp instanceof RegExp && Types.isNumber(pattern.file)) {
result.push(terminal.registerLinkMatcher(pattern.regexp, (match: string) => {
let resource: URI = getResource(match, matcher);
if (resource) {
this.workbenchEditorService.openEditor({
resource: resource
});
}
}, 0));
}
};

for (let problemMatcher of problemMatchers) {
if (Array.isArray(problemMatcher.pattern)) {
for (let pattern of problemMatcher.pattern) {
handlePattern(problemMatcher, pattern);
}
} else if (problemMatcher.pattern) {
handlePattern(problemMatcher, problemMatcher.pattern);
}
}
*/
return result;
}

private static WellKnowCommands: IStringDictionary<boolean> = {
'ant': true,
'cmake': true,
Expand Down
Loading