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.

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 custom editor tests #152777

Merged
merged 2 commits into from Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 0 additions & 18 deletions .vscode/launch.json
Expand Up @@ -201,24 +201,6 @@
"order": 5
}
},
{
"type": "extensionHost",
"request": "launch",
"name": "VS Code Custom Editor Tests",
"runtimeExecutable": "${execPath}",
"args": [
"${workspaceFolder}/extensions/vscode-custom-editor-tests/test-workspace",
"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-custom-editor-tests",
"--extensionTestsPath=${workspaceFolder}/extensions/vscode-custom-editor-tests/out/test"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js"
],
"presentation": {
"group": "5_tests",
"order": 6
}
},
{
"type": "pwa-chrome",
"request": "attach",
Expand Down
1 change: 0 additions & 1 deletion build/azure-pipelines/darwin/product-build-darwin-test.yml
Expand Up @@ -52,7 +52,6 @@ steps:
compile-extension:typescript-language-features \
compile-extension:vscode-api-tests \
compile-extension:vscode-colorize-tests \
compile-extension:vscode-custom-editor-tests \
compile-extension:vscode-notebook-tests \
compile-extension:vscode-test-resolver
displayName: Build integration tests
Expand Down
Expand Up @@ -64,7 +64,6 @@ steps:
compile-extension:typescript-language-features \
compile-extension:vscode-api-tests \
compile-extension:vscode-colorize-tests \
compile-extension:vscode-custom-editor-tests \
compile-extension:vscode-notebook-tests \
compile-extension:vscode-test-resolver
displayName: Build integration tests
Expand Down
1 change: 0 additions & 1 deletion build/azure-pipelines/win32/product-build-win32-test.yml
Expand Up @@ -58,7 +58,6 @@ steps:
compile-extension:typescript-language-features `
compile-extension:vscode-api-tests `
compile-extension:vscode-colorize-tests `
compile-extension:vscode-custom-editor-tests `
compile-extension:vscode-notebook-tests `
compile-extension:vscode-test-resolver `
}
Expand Down
2 changes: 0 additions & 2 deletions build/filters.js
Expand Up @@ -48,7 +48,6 @@ module.exports.unicodeFilter = [
'!extensions/typescript-language-features/test-workspace/**',
'!extensions/vscode-api-tests/testWorkspace/**',
'!extensions/vscode-api-tests/testWorkspace2/**',
'!extensions/vscode-custom-editor-tests/test-workspace/**',
'!extensions/**/dist/**',
'!extensions/**/out/**',
'!extensions/**/snippets/**',
Expand Down Expand Up @@ -84,7 +83,6 @@ module.exports.indentationFilter = [
'!extensions/markdown-math/notebook-out/**',
'!extensions/vscode-api-tests/testWorkspace/**',
'!extensions/vscode-api-tests/testWorkspace2/**',
'!extensions/vscode-custom-editor-tests/test-workspace/**',
'!build/monaco/**',
'!build/win32/**',

Expand Down
1 change: 0 additions & 1 deletion build/gulpfile.extensions.js
Expand Up @@ -66,7 +66,6 @@ const compilations = [
'typescript-language-features/tsconfig.json',
'vscode-api-tests/tsconfig.json',
'vscode-colorize-tests/tsconfig.json',
'vscode-custom-editor-tests/tsconfig.json',
'vscode-notebook-tests/tsconfig.json',
'vscode-test-resolver/tsconfig.json'
];
Expand Down
1 change: 0 additions & 1 deletion build/lib/extensions.js
Expand Up @@ -246,7 +246,6 @@ const excludedExtensions = [
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'vscode-notebook-tests',
'vscode-custom-editor-tests',
];
const marketplaceWebExtensionsExclude = new Set([
'ms-vscode.node-debug',
Expand Down
1 change: 0 additions & 1 deletion build/lib/extensions.ts
Expand Up @@ -286,7 +286,6 @@ const excludedExtensions = [
'ms-vscode.node-debug',
'ms-vscode.node-debug2',
'vscode-notebook-tests',
'vscode-custom-editor-tests',
];

const marketplaceWebExtensionsExclude = new Set([
Expand Down
1 change: 0 additions & 1 deletion build/npm/dirs.js
Expand Up @@ -41,7 +41,6 @@ exports.dirs = [
'extensions/typescript-language-features',
'extensions/vscode-api-tests',
'extensions/vscode-colorize-tests',
'extensions/vscode-custom-editor-tests',
'extensions/vscode-notebook-tests',
'extensions/vscode-test-resolver',
'remote',
Expand Down
5 changes: 3 additions & 2 deletions extensions/markdown-language-features/src/extension.ts
Expand Up @@ -38,8 +38,10 @@ export function activate(context: vscode.ExtensionContext) {
const contributions = getMarkdownExtensionContributions(context);
context.subscriptions.push(contributions);

const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
const logger = new Logger();
context.subscriptions.push(logger);

const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
const commandManager = new CommandManager();

const engine = new MarkdownItEngine(contributions, githubSlugifier);
Expand All @@ -56,7 +58,6 @@ export function activate(context: vscode.ExtensionContext) {
context.subscriptions.push(registerMarkdownCommands(commandManager, previewManager, telemetryReporter, cspArbiter, engine, tocProvider));

context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
logger.updateConfiguration();
previewManager.updateConfiguration();
}));
}
Expand Down
29 changes: 15 additions & 14 deletions extensions/markdown-language-features/src/logger.ts
Expand Up @@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import * as vscode from 'vscode';
import { Disposable } from './util/dispose';
import { lazy } from './util/lazy';

enum Trace {
Expand All @@ -25,17 +26,18 @@ namespace Trace {
}
}


function isString(value: any): value is string {
return Object.prototype.toString.call(value) === '[object String]';
}

export class Logger {
export class Logger extends Disposable {
private trace?: Trace;

private readonly outputChannel = lazy(() => vscode.window.createOutputChannel('Markdown'));
private readonly outputChannel = lazy(() => this._register(vscode.window.createOutputChannel('Markdown')));

constructor() {
super();

this._register(vscode.workspace.onDidChangeConfiguration(() => {
this.updateConfiguration();
}));

this.updateConfiguration();
}

Expand All @@ -48,20 +50,19 @@ export class Logger {
}
}


private now(): string {
const now = new Date();
return String(now.getUTCHours()).padStart(2, '0')
+ ':' + String(now.getMinutes()).padStart(2, '0')
+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + now.getMilliseconds();
}

public updateConfiguration() {
private updateConfiguration(): void {
this.trace = this.readTrace();
}

private appendLine(value: string) {
return this.outputChannel.value.appendLine(value);
private appendLine(value: string): void {
this.outputChannel.value.appendLine(value);
}

private readTrace(): Trace {
Expand All @@ -70,12 +71,12 @@ export class Logger {

private static data2String(data: any): string {
if (data instanceof Error) {
if (isString(data.stack)) {
if (typeof data.stack === 'string') {
return data.stack;
}
return (data as Error).message;
return data.message;
}
if (isString(data)) {
if (typeof data === 'string') {
return data;
}
return JSON.stringify(data, undefined, 2);
Expand Down
12 changes: 0 additions & 12 deletions extensions/vscode-custom-editor-tests/.vscodeignore

This file was deleted.

This file was deleted.

Binary file removed extensions/vscode-custom-editor-tests/media/icon.png
Binary file not shown.
45 changes: 0 additions & 45 deletions extensions/vscode-custom-editor-tests/package.json

This file was deleted.