Lgtm bugfixes (#4838)

* code tidy up: always evaluates

* tidy up: is always true

* tidy up: remove unused code

* always true/false variables

* unused variable

* tidy up: remove unused code in caretPosition.js

* for squash: Revert "tidy up: remove unused code in caretPosition.js"

The `if` condition was previously always true, so the body should be
preserved. If the body is preserved, other logic can be deleted. I
opened PR #4845 to clean it all up.

This reverts commit 75b03e5a7d.

* for squash: simplify

* for squash: Explain that the getter is used for its side effects

It's very weird to call a getter without using its return value. Add a
comment explaining why this is done so that the reader doesn't get
confused.

* for squash: Revert "tidy up: remove unused code"

The exception test was the purpose of the code.

This reverts commit 85153b1676.

* for squash: Log the tsort results

Co-authored-by: Richard Hansen <rhansen@rhansen.org>
pull/4757/head
John McLear 2021-02-22 08:26:35 +00:00 committed by GitHub
parent de186fbe36
commit ce83181ac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 10 deletions

View File

@ -722,7 +722,7 @@ Example returns:
*/
exports.sendClientsMessage = async (padID, msg) => {
const pad = await getPadSafe(padID, true);
await getPadSafe(padID, true); // Throw if the padID is invalid or if the pad does not exist.
padMessageHandler.handleCustomMessage(padID, msg);
};

View File

@ -87,7 +87,7 @@ Pad.prototype.appendRevision = async function appendRevision(aChangeset, author)
// ex. getNumForAuthor
if (author !== '') {
this.pool.putAttrib(['author', author || '']);
this.pool.putAttrib(['author', author]);
}
if (newRev % 100 === 0) {

View File

@ -314,7 +314,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
await hooks.aCallAll('getLineHTMLForExport', context);
// To create list parent elements
if ((!prevLine || prevLine.listLevel !== line.listLevel) ||
(prevLine && line.listTypeName !== prevLine.listTypeName)) {
(line.listTypeName !== prevLine.listTypeName)) {
const exists = _.find(openLists, (item) => (
item.level === line.listLevel && item.type === line.listTypeName)
);
@ -414,7 +414,7 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
if ((!nextLine ||
!nextLine.listLevel ||
nextLine.listLevel < line.listLevel) ||
(nextLine && line.listTypeName !== nextLine.listTypeName)) {
(line.listTypeName !== nextLine.listTypeName)) {
let nextLevel = 0;
if (nextLine && nextLine.listLevel) {
nextLevel = nextLine.listLevel;

View File

@ -209,10 +209,8 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
if (selStart[1] === selEnd[1] && selStart[0] === selEnd[0]) return false;
if (selStart[0] !== selEnd[0]) { // -> More than one line selected
let hasAttrib = true;
// from selStart to the end of the first line
hasAttrib = hasAttrib && rangeHasAttrib(
let hasAttrib = rangeHasAttrib(
selStart, [selStart[0], rep.lines.atIndex(selStart[0]).text.length]);
// for all lines in between

View File

@ -1759,7 +1759,7 @@ exports.makeAttribsString = (opcode, attribs, pool) => {
return '';
} else if ((typeof attribs) === 'string') {
return attribs;
} else if (pool && attribs && attribs.length) {
} else if (pool && attribs.length) {
if (attribs.length > 1) {
attribs = attribs.slice();
attribs.sort();

View File

@ -3782,7 +3782,7 @@ function Ace2Inner() {
// We apply the height of a line in the doc body, to the corresponding sidediv line number
const updateLineNumbers = () => {
if (!currentCallStack || currentCallStack && !currentCallStack.domClean) return;
if (!currentCallStack || !currentCallStack.domClean) return;
// Refs #4228, to avoid layout trashing, we need to first calculate all the heights,
// and then apply at once all new height to div elements

View File

@ -195,7 +195,7 @@ const makeContentCollector = (collectStyles, abrowser, apool, className2Author)
}
}
if (listType === 'none' || !listType) {
if (listType === 'none') {
delete state.lineAttributes.list;
} else {
state.lineAttributes.list = listType;

View File

@ -81,6 +81,7 @@ const tsortTest = () => {
try {
sorted = tsort(edges);
console.log('succeeded', sorted);
} catch (e) {
console.log(e.message);
}