Resolve merge conflict around unused locals
This commit is contained in:
parent
68491dafa7
commit
04f322fc89
4 changed files with 2 additions and 18 deletions
|
@ -4,7 +4,7 @@
|
|||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as assert from 'assert';
|
||||
import { Selection, commands } from 'vscode';
|
||||
import { Selection } from 'vscode';
|
||||
import { withRandomFileEditor, closeAllEditors } from './testUtils';
|
||||
import { reflectCssValue } from '../reflectCssValue';
|
||||
|
||||
|
|
|
@ -7,11 +7,9 @@ import * as assert from 'assert';
|
|||
import { Selection } from 'vscode';
|
||||
import { withRandomFileEditor, closeAllEditors } from './testUtils';
|
||||
import { updateImageSize } from '../updateImageSize';
|
||||
import * as path from 'path';
|
||||
|
||||
suite('Tests for Emmet actions on html tags', () => {
|
||||
teardown(closeAllEditors);
|
||||
const filePath = path.join(__dirname, '../../../../resources/linux/code.png');
|
||||
|
||||
test('update image css with multiple cursors in css file', () => {
|
||||
const cssContents = `
|
||||
|
|
|
@ -263,11 +263,6 @@ export class Sash extends EventEmitter {
|
|||
this.$e = null;
|
||||
}
|
||||
|
||||
if (this.gesture) {
|
||||
this.gesture.dispose();
|
||||
this.gesture = null;
|
||||
}
|
||||
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,8 +19,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
|||
import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
|
||||
import { IOpenerService } from 'vs/platform/opener/common/opener';
|
||||
import { marked } from 'vs/base/common/marked/marked';
|
||||
import { IModeService } from 'vs/editor/common/services/modeService';
|
||||
import { IFileService } from 'vs/platform/files/common/files';
|
||||
import { IModelService } from 'vs/editor/common/services/modelService';
|
||||
import { CodeEditor } from 'vs/editor/browser/codeEditor';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
|
@ -34,7 +32,6 @@ import { once } from 'vs/base/common/event';
|
|||
import { isObject } from 'vs/base/common/types';
|
||||
import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||
import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
|
||||
import { IPartService } from 'vs/workbench/services/part/common/partService';
|
||||
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
|
||||
import { IMessageService, Severity } from 'vs/platform/message/common/message';
|
||||
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||
|
@ -99,18 +96,12 @@ export class WalkThroughPart extends BaseEditor {
|
|||
@IInstantiationService private instantiationService: IInstantiationService,
|
||||
@IThemeService protected themeService: IThemeService,
|
||||
@IOpenerService private openerService: IOpenerService,
|
||||
// @ts-ignore unused injected service
|
||||
@IFileService private fileService: IFileService,
|
||||
@IModelService protected modelService: IModelService,
|
||||
@IKeybindingService private keybindingService: IKeybindingService,
|
||||
@IStorageService private storageService: IStorageService,
|
||||
@IContextKeyService private contextKeyService: IContextKeyService,
|
||||
@IConfigurationService private configurationService: IConfigurationService,
|
||||
// @ts-ignore unused injected service
|
||||
@IModeService private modeService: IModeService,
|
||||
@IMessageService private messageService: IMessageService,
|
||||
// @ts-ignore unused injected service
|
||||
@IPartService private partService: IPartService
|
||||
@IMessageService private messageService: IMessageService
|
||||
) {
|
||||
super(WalkThroughPart.ID, telemetryService, themeService);
|
||||
this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
|
||||
|
|
Loading…
Reference in a new issue