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

os.EOL instead of hardcode \n for fast notebook source changes (#6986)

Browse Source 
* os.EOL instead of hardcode \n

* test fixes
This commit is contained in:
Chris LaFreniere
2019-08-27 17:36:07 -07:00
committed by GitHub
parent 65b315bf4c
commit 4e25bc9396
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/workbench/parts/notebook/common/models/notebookTextFileModel.ts
View File

@@ -9,6 +9,7 @@ import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textF
import { FindMatch } from 'vs/editor/common/model'; import { FindMatch } from 'vs/editor/common/model';
import { NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; import { NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts';
import * as os from 'os';
export class NotebookTextFileModel { export class NotebookTextFileModel {
// save active cell's line/column in editor model for the beginning of the source property // save active cell's line/column in editor model for the beginning of the source property
@@ -52,7 +53,7 @@ export class NotebookTextFileModel {
// this is another string // this is another string
textEditorModel.textEditorModel.applyEdits([{ textEditorModel.textEditorModel.applyEdits([{
range: new Range(convertedRange.startLineNumber, convertedRange.startColumn, convertedRange.endLineNumber, convertedRange.endColumn), range: new Range(convertedRange.startLineNumber, convertedRange.startColumn, convertedRange.endLineNumber, convertedRange.endColumn),
text: change.text.split('\n').join('\\n\",\n'.concat(startSpaces).concat('\"')) text: change.text.split(os.EOL).join('\\n\",'.concat(os.EOL).concat(startSpaces).concat('\"'))
}]); }]);
}); });
} else { } else {

9
src/sql/workbench/parts/notebook/test/common/notebookEditorModel.test.ts
View File

@@ -5,6 +5,7 @@
import * as should from 'should'; import * as should from 'should';
import * as TypeMoq from 'typemoq'; import * as TypeMoq from 'typemoq';
import * as os from 'os';
import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
@@ -297,8 +298,8 @@ suite('Notebook Editor Model', function (): void {
cells: [newCell], cells: [newCell],
cellIndex: 0, cellIndex: 0,
modelContentChangedEvent: { modelContentChangedEvent: {
changes: [{ range: new Range(1, 1, 1, 1), rangeLength: 0, rangeOffset: 0, text: 'This is a test\nLine 2 test\nLine 3 test' }], changes: [{ range: new Range(1, 1, 1, 1), rangeLength: 0, rangeOffset: 0, text: 'This is a test' + os.EOL + 'Line 2 test' + os.EOL + 'Line 3 test' }],
eol: '\n', eol: os.EOL,
isFlush: false, isFlush: false,
isRedoing: false, isRedoing: false,
isUndoing: false, isUndoing: false,
@@ -450,8 +451,8 @@ suite('Notebook Editor Model', function (): void {
cells: [newCell], cells: [newCell],
cellIndex: 0, cellIndex: 0,
modelContentChangedEvent: { modelContentChangedEvent: {
changes: [{ range: new Range(1, 1, 1, 1), rangeLength: 0, rangeOffset: 0, text: 'This is a test\nLine 2 test\nLine 3 test' }], changes: [{ range: new Range(1, 1, 1, 1), rangeLength: 0, rangeOffset: 0, text: 'This is a test' + os.EOL + 'Line 2 test' + os.EOL + 'Line 3 test' }],
eol: '\n', eol: os.EOL,
isFlush: false, isFlush: false,
isRedoing: false, isRedoing: false,
isUndoing: false, isUndoing: false,