Skip to content

Commit

Permalink
run prettier to all files (microsoft#414)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JiuqingSong
JiuqingSong authored May 18, 2020
1 parent 23c6060 commit a0624b1
Show file tree
Hide file tree
Showing 26 changed files with 273 additions and 121 deletions.
3 changes: 2 additions & 1 deletion .prettierrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"jsxBracketSameLine": true,
"semi": true,
"bracketSpacing": true,
"endOfLine": "crlf"
"endOfLine": "crlf",
"arrowParens": "avoid"
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"dist/**": true,
"stats.json": true
},
"prettier.arrowParens": "avoid",
"prettier.singleQuote": true,
"editor.formatOnSave": true,
"prettier.tabWidth": 4,
Expand All @@ -21,4 +22,4 @@
"typescript.extension.sortImports.sortOnSave": true,
"prettier.jsxBracketSameLine": true,
"typescript.extension.sortImports.maxNamedImportsInSingleLine": 4
}
}
6 changes: 1 addition & 5 deletions packages/roosterjs-editor-api/lib/format/clearBlockFormat.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,7 @@ export default function clearBlockFormat(
let styles = group.td.getAttribute('style') || '';
let styleArray = styles.split(';');
styleArray = styleArray.filter(
style =>
style
.trim()
.toLowerCase()
.indexOf('border') == 0
style => style.trim().toLowerCase().indexOf('border') == 0
);
styles = styleArray.join(';');
if (styles) {
Expand Down
4 changes: 2 additions & 2 deletions packages/roosterjs-editor-api/lib/test/format/replaceRangeWithNodeTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ describe('replaceRangeWithNode replaceRangeWithNode()', () => {
let editor: Editor;
let nodeID = 'replaceNode';

beforeEach(function() {
beforeEach(function () {
editor = TestHelper.initEditor(testID);
});

afterEach(function() {
afterEach(function () {
editor.dispose();
TestHelper.removeElement(testID);
TestHelper.removeElement(nodeID);
Expand Down
4 changes: 1 addition & 3 deletions packages/roosterjs-editor-core/lib/corePlugins/DOMEventPlugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ export default class DOMEventPlugin implements EditorPlugin {
let range = this.editor.getSelectionRange();
if (
range.collapsed &&
Position.getStart(range)
.normalize()
.equalTo(this.cachedPosition)
Position.getStart(range).normalize().equalTo(this.cachedPosition)
) {
this.restorePendingFormatState();
} else {
Expand Down
15 changes: 6 additions & 9 deletions packages/roosterjs-editor-core/lib/editor/createEditorCore.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,10 @@ function createCoreApiMap(map?: Partial<CoreApiMap>): CoreApiMap {
}

function createCustomData(initValue: { [key: string]: any }): CustomDataMap {
return Object.keys(initValue).reduce(
(result, key) => {
result[key] = {
value: initValue[key],
};
return result;
},
<CustomDataMap>{}
);
return Object.keys(initValue).reduce((result, key) => {
result[key] = {
value: initValue[key],
};
return result;
}, <CustomDataMap>{});
}
2 changes: 1 addition & 1 deletion packages/roosterjs-editor-dom/lib/blockElements/NodeBlockElement.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BlockElement } from 'roosterjs-editor-types';
* In most cases, it corresponds to an HTML block level element, i.e. P, DIV, LI, TD etc.
*/
export default class NodeBlockElement implements BlockElement {
constructor(private element: HTMLElement) { }
constructor(private element: HTMLElement) {}

/**
* Collapse this element to a single DOM element.
Expand Down
2 changes: 1 addition & 1 deletion packages/roosterjs-editor-dom/lib/blockElements/StartEndBlockElement.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const STRUCTURE_NODE_TAGS = ['TD', 'TH', 'LI', 'BLOCKQUOTE'];
* This start and end must be in same sibling level and have same parent in DOM tree
*/
export default class StartEndBlockElement implements BlockElement {
constructor(private rootNode: Node, private startNode: Node, private endNode: Node) { }
constructor(private rootNode: Node, private startNode: Node, private endNode: Node) {}

static getBlockContext(node: Node): HTMLElement {
while (node && !isBlockElement(node)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/roosterjs-editor-dom/lib/test/inlineElements/NodeInlineElementTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ describe('NodeInlineElement applyStyle()', () => {
let mockColor = 'red';

// Act
element.applyStyle(function(node: HTMLElement) {
element.applyStyle(function (node: HTMLElement) {
node.style.color = mockColor;
});

Expand Down
2 changes: 1 addition & 1 deletion packages/roosterjs-editor-dom/lib/test/inlineElements/PartialInelineElementTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ describe('PartialInlineElement applyStyle()', () => {
);

// Act
partialInlineElement.applyStyle(function(node: HTMLElement) {
partialInlineElement.applyStyle(function (node: HTMLElement) {
node.style.color = 'red';
});

Expand Down
6 changes: 5 additions & 1 deletion packages/roosterjs-editor-dom/lib/test/selections/createRangeTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ describe('createRange() with nodes', () => {
}

it('Null', () => {
runTest('', () => [null, null], () => null);
runTest(
'',
() => [null, null],
() => null
);
});

it('Collapsed', () => {
Expand Down
48 changes: 42 additions & 6 deletions packages/roosterjs-editor-dom/lib/test/selections/isPositionAtBeginningOfTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,43 @@ describe('isPositionAtBeginningOf()', () => {
}

it('Position is null', () => {
runTest('', () => null, 0, () => null, false);
runTest(
'',
() => null,
0,
() => null,
false
);
});

it('Target node is null', () => {
runTest('<div id=id1></div>', () => $('id1'), 0, () => null, false);
runTest(
'<div id=id1></div>',
() => $('id1'),
0,
() => null,
false
);
});

it('Is first child', () => {
runTest('<div id=id1>test</div>', () => $('id1'), 0, () => $('id1'), true);
runTest(
'<div id=id1>test</div>',
() => $('id1'),
0,
() => $('id1'),
true
);
});

it('Has space before position', () => {
runTest('<div id=id1> <span></span>test</div>', () => $('id1'), 1, () => $('id1'), false);
runTest(
'<div id=id1> <span></span>test</div>',
() => $('id1'),
1,
() => $('id1'),
false
);
runTest(
'<div id=id1>&#8203;<span></span>test</div>',
() => $('id1'),
Expand All @@ -51,8 +75,20 @@ describe('isPositionAtBeginningOf()', () => {
});

it('Inside text', () => {
runTest('<div id=id1>test</div>', () => $('id1').firstChild, 0, () => $('id1'), true);
runTest('<div id=id1>test</div>', () => $('id1').firstChild, 2, () => $('id1'), false);
runTest(
'<div id=id1>test</div>',
() => $('id1').firstChild,
0,
() => $('id1'),
true
);
runTest(
'<div id=id1>test</div>',
() => $('id1').firstChild,
2,
() => $('id1'),
false
);
});

it('Nested node', () => {
Expand Down
100 changes: 82 additions & 18 deletions packages/roosterjs-editor-dom/lib/test/table/VTableTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,16 @@ describe('VTable.ctor', () => {
undefined,
undefined,
[
[[true, false, false], [true, false, false], [true, false, false]],
[[true, false, false], [true, false, false], [true, false, false]],
[
[true, false, false],
[true, false, false],
[true, false, false],
],
[
[true, false, false],
[true, false, false],
[true, false, false],
],
]
);
runTest(
Expand All @@ -50,8 +58,16 @@ describe('VTable.ctor', () => {
1,
0,
[
[[true, false, false], [true, false, false], [true, false, false]],
[[true, false, false], [true, false, false], [true, false, false]],
[
[true, false, false],
[true, false, false],
[true, false, false],
],
[
[true, false, false],
[true, false, false],
[true, false, false],
],
]
);
});
Expand All @@ -67,8 +83,14 @@ describe('VTable.ctor', () => {
1,
1,
[
[[true, false, false], [false, true, false]],
[[true, false, false], [true, false, false]],
[
[true, false, false],
[false, true, false],
],
[
[true, false, false],
[true, false, false],
],
]
);
});
Expand All @@ -80,8 +102,14 @@ describe('VTable.ctor', () => {
1,
0,
[
[[true, false, false], [true, false, false]],
[[true, false, false], [false, true, false]],
[
[true, false, false],
[true, false, false],
],
[
[true, false, false],
[false, true, false],
],
]
);
});
Expand All @@ -93,8 +121,14 @@ describe('VTable.ctor', () => {
1,
1,
[
[[true, false, false], [true, false, false]],
[[false, false, true], [true, false, false]],
[
[true, false, false],
[true, false, false],
],
[
[false, false, true],
[true, false, false],
],
]
);
});
Expand All @@ -106,8 +140,14 @@ describe('VTable.ctor', () => {
0,
1,
[
[[true, false, false], [true, false, false]],
[[true, false, false], [false, false, true]],
[
[true, false, false],
[true, false, false],
],
[
[true, false, false],
[false, false, true],
],
]
);
});
Expand All @@ -119,9 +159,21 @@ describe('VTable.ctor', () => {
2,
2,
[
[[true, false, false], [false, true, false], [true, false, false]],
[[false, false, true], [false, true, true], [true, false, false]],
[[true, false, false], [true, false, false], [true, false, false]],
[
[true, false, false],
[false, true, false],
[true, false, false],
],
[
[false, false, true],
[false, true, true],
[true, false, false],
],
[
[true, false, false],
[true, false, false],
[true, false, false],
],
]
);
});
Expand All @@ -133,9 +185,21 @@ describe('VTable.ctor', () => {
1,
1,
[
[[true, false, false], [true, false, false], [false, true, false]],
[[false, false, true], [true, false, false], [true, false, false]],
[[true, false, false], [false, true, false], [false, false, true]],
[
[true, false, false],
[true, false, false],
[false, true, false],
],
[
[false, false, true],
[true, false, false],
[true, false, false],
],
[
[true, false, false],
[false, true, false],
[false, false, true],
],
]
);
});
Expand Down
28 changes: 24 additions & 4 deletions packages/roosterjs-editor-dom/lib/test/utils/findClosestElementAncestorTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,30 @@ describe('findClosestElementAncestor()', () => {
}

it('findClosestElementAncestor()', () => {
runTest(0, '', () => null, () => null);
runTest(1, 'test', root => root.firstChild, root => root);
runTest(2, '<div></div>', root => root.firstChild, root => root.firstChild as HTMLElement);
runTest(3, '<!--test-->', root => root.firstChild, root => root);
runTest(
0,
'',
() => null,
() => null
);
runTest(
1,
'test',
root => root.firstChild,
root => root
);
runTest(
2,
'<div></div>',
root => root.firstChild,
root => root.firstChild as HTMLElement
);
runTest(
3,
'<!--test-->',
root => root.firstChild,
root => root
);
});
});

Expand Down
Loading

0 comments on commit a0624b1

Please sign in to comment.