ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode cbeff45f80213db0ddda2183170281ed97ed3b12 (#8670)

Browse Source 
* Merge from vscode cbeff45f80213db0ddda2183170281ed97ed3b12

* fix null strict checks
This commit is contained in:
Anthony Dresser
2019-12-13 00:50:37 -08:00
committed by GitHub
parent 67abc2f690
commit 642920504a
136 changed files with 2918 additions and 1729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
View File

@@ -13,7 +13,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
import { EditorOption, EditorOptions } from 'vs/editor/common/config/editorOptions';
import { IEditorContribution } from 'vs/editor/common/editorCommon';
import { ITextModel } from 'vs/editor/common/model';
import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
import { IResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -54,7 +54,7 @@ function readTransientState(model: ITextModel, codeEditorService: ICodeEditorSer
return codeEditorService.getTransientModelProperty(model, transientWordWrapState);
}
function readWordWrapState(model: ITextModel, configurationService: ITextResourceConfigurationService, codeEditorService: ICodeEditorService): IWordWrapState {
function readWordWrapState(model: ITextModel, configurationService: IResourceConfigurationService, codeEditorService: ICodeEditorService): IWordWrapState {
const editorConfig = configurationService.getValue(model.uri, 'editor') as { wordWrap: 'on' | 'off' | 'wordWrapColumn' | 'bounded'; wordWrapMinified: boolean };
let _configuredWordWrap = editorConfig && (typeof editorConfig.wordWrap === 'string' || typeof editorConfig.wordWrap === 'boolean') ? editorConfig.wordWrap : undefined;
@@ -146,7 +146,7 @@ class ToggleWordWrapAction extends EditorAction {
return;
}
const textResourceConfigurationService = accessor.get(ITextResourceConfigurationService);
const textResourceConfigurationService = accessor.get(IResourceConfigurationService);
const codeEditorService = accessor.get(ICodeEditorService);
const model = editor.getModel();
@@ -171,7 +171,7 @@ class ToggleWordWrapController extends Disposable implements IEditorContribution
constructor(
private readonly editor: ICodeEditor,
@IContextKeyService readonly contextKeyService: IContextKeyService,
@ITextResourceConfigurationService readonly configurationService: ITextResourceConfigurationService,
@IResourceConfigurationService readonly configurationService: IResourceConfigurationService,
@ICodeEditorService readonly codeEditorService: ICodeEditorService
) {
super();