ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-25 11:01:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1df23554b2e3d5f1efc6fbc76ee61d3f7f186c6d

Browse Source
This commit is contained in:
ADS Merger
2020-03-12 06:51:03 +00:00
parent a68a6b9e44
commit b5592959c7
56 changed files with 1091 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/editor/browser/viewParts/lines/viewLine.ts
View File

@@ -616,7 +616,15 @@ class RenderedViewLine implements IRenderedViewLine {
if (!r || r.length === 0) {
return -1;
}
return r[0].left;
const result = r[0].left;
if (this.input.isBasicASCII) {
const charOffset = this._characterMapping.getAbsoluteOffsets();
const expectedResult = Math.round(this.input.spaceWidth * charOffset[column - 1]);
if (Math.abs(expectedResult - result) <= 1) {
return expectedResult;
}
}
return result;
}
private _readRawVisibleRangesForRange(domNode: FastDomNode<HTMLElement>, startColumn: number, endColumn: number, context: DomReadingContext): HorizontalRange[] | null {

8
src/vs/editor/contrib/caretOperations/caretOperations.ts
View File

@@ -42,8 +42,8 @@ class MoveCaretLeftAction extends MoveCaretAction {
constructor() {
super(true, {
id: 'editor.action.moveCarretLeftAction',
label: nls.localize('caret.moveLeft', "Move Caret Left"),
alias: 'Move Caret Left',
label: nls.localize('caret.moveLeft', "Move Selected Text Left"),
alias: 'Move Selected Text Left',
precondition: EditorContextKeys.writable
});
}
@@ -53,8 +53,8 @@ class MoveCaretRightAction extends MoveCaretAction {
constructor() {
super(false, {
id: 'editor.action.moveCarretRightAction',
label: nls.localize('caret.moveRight', "Move Caret Right"),
alias: 'Move Caret Right',
label: nls.localize('caret.moveRight', "Move Selected Text Right"),
alias: 'Move Selected Text Right',
precondition: EditorContextKeys.writable
});
}

6
src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
View File

@@ -330,7 +330,11 @@ class ShowAccessibilityHelpAction extends EditorAction {
kbOpts: {
kbExpr: EditorContextKeys.focus,
primary: KeyMod.Alt | KeyCode.F1,
weight: KeybindingWeight.EditorContrib
weight: KeybindingWeight.EditorContrib,
linux: {
primary: KeyMod.Alt | KeyMod.Shift | KeyCode.F1,
secondary: [KeyMod.Alt | KeyCode.F1]
}
}
});
}