mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Add rules to eslint to better match our coding conventions.
Summary: We used tslint earlier, and on switching to eslint, some rules were not transfered. This moves more rules over, for consistent conventions or helpful warnings. - Name private members with a leading underscore. - Prefer interface over a type alias. - Use consistent spacing around ':' in type annotations. - Use consistent spacing around braces of code blocks. - Use semicolons consistently at the ends of statements. - Use braces around even one-liner blocks, like conditionals and loops. - Warn about shadowed variables. Test Plan: Fixed all new warnings. Should be no behavior changes in code. Reviewers: paulfitz Reviewed By: paulfitz Differential Revision: https://phab.getgrist.com/D2831
This commit is contained in:
@@ -31,7 +31,7 @@ export function isEquivalentFilter(state: FilterState, spec: FilterSpec): boolea
|
||||
const other = makeFilterState(spec);
|
||||
if (state.include !== other.include) { return false; }
|
||||
if (state.values.size !== other.values.size) { return false; }
|
||||
for (const val of other.values) { if (!state.values.has(val)) { return false; }}
|
||||
for (const val of other.values) { if (!state.values.has(val)) { return false; } }
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ export class SearchModelImpl extends Disposable implements SearchModel {
|
||||
this.autoDispose(this.value.addListener(v => { void findFirst(v); }));
|
||||
|
||||
// Set this.noMatch to false when multiPage gets turned ON.
|
||||
this.autoDispose(this.multiPage.addListener(v => { if (v) { this.noMatch.set(false); }}));
|
||||
this.autoDispose(this.multiPage.addListener(v => { if (v) { this.noMatch.set(false); } }));
|
||||
|
||||
// Schedule a search restart when user changes pages (otherwise search would resume from the
|
||||
// previous page that is not shown anymore). Also revert noMatch flag when in single page mode.
|
||||
|
||||
@@ -207,7 +207,7 @@ export class TreeNodeRecord implements TreeNode {
|
||||
// Get all the records included in this item.
|
||||
public getRecords(): TreeRecord[] {
|
||||
const records = [] as TreeRecord[];
|
||||
if (this.index !== "root") {records.push(this._records[this.index]); }
|
||||
if (this.index !== "root") { records.push(this._records[this.index]); }
|
||||
walkTree(this, (item: TreeItemRecord) => records.push(this._records[item.index]));
|
||||
return records;
|
||||
}
|
||||
@@ -255,7 +255,7 @@ export function find(model: TreeNode, func: (item: TreeItem) => boolean): TreeIt
|
||||
if (children) {
|
||||
for (const child of children.get()) {
|
||||
const found = func(child) && child || find(child, func);
|
||||
if (found) {return found; }
|
||||
if (found) { return found; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ function _getLoginLogoutUrl(method: 'login'|'logout'|'signin', nextUrl: string):
|
||||
* only public interface is the urlState() accessor.
|
||||
*/
|
||||
export class UrlStateImpl {
|
||||
constructor(private window: {gristConfig?: Partial<GristLoadConfig>}) {}
|
||||
constructor(private _window: {gristConfig?: Partial<GristLoadConfig>}) {}
|
||||
|
||||
/**
|
||||
* The actual serialization of a url state into a URL. The URL has the form
|
||||
@@ -105,7 +105,7 @@ export class UrlStateImpl {
|
||||
* localhost:8080/o/<org>
|
||||
*/
|
||||
public encodeUrl(state: IGristUrlState, baseLocation: Location | URL): string {
|
||||
const gristConfig = this.window.gristConfig || {};
|
||||
const gristConfig = this._window.gristConfig || {};
|
||||
return encodeUrl(gristConfig, state, baseLocation);
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ export class UrlStateImpl {
|
||||
* Parse a URL location into an IGristUrlState object. See encodeUrl() documentation.
|
||||
*/
|
||||
public decodeUrl(location: Location | URL): IGristUrlState {
|
||||
const gristConfig = this.window.gristConfig || {};
|
||||
const gristConfig = this._window.gristConfig || {};
|
||||
return decodeUrl(gristConfig, location);
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ export class UrlStateImpl {
|
||||
* a matter of DocWorker requiring a different version (e.g. /v/OTHER/doc/...).
|
||||
*/
|
||||
public needPageLoad(prevState: IGristUrlState, newState: IGristUrlState): boolean {
|
||||
const gristConfig = this.window.gristConfig || {};
|
||||
const gristConfig = this._window.gristConfig || {};
|
||||
const orgReload = prevState.org !== newState.org;
|
||||
// Reload when moving to/from a document or between doc and non-doc.
|
||||
const docReload = prevState.doc !== newState.doc;
|
||||
|
||||
@@ -368,25 +368,25 @@ export class FilteredRowSource extends BaseFilteredRowSource {
|
||||
* Private helper object that maintains a set of rows for a particular group.
|
||||
*/
|
||||
class RowGroupHelper<Value> extends RowSource {
|
||||
private rows: Set<RowId> = new Set();
|
||||
private _rows: Set<RowId> = new Set();
|
||||
constructor(public readonly groupValue: Value) {
|
||||
super();
|
||||
}
|
||||
|
||||
public getAllRows() {
|
||||
return this.rows.values();
|
||||
return this._rows.values();
|
||||
}
|
||||
|
||||
public getNumRows(): number {
|
||||
return this.rows.size;
|
||||
return this._rows.size;
|
||||
}
|
||||
|
||||
public _addAll(rows: RowList) {
|
||||
for (const r of rows) { this.rows.add(r); }
|
||||
for (const r of rows) { this._rows.add(r); }
|
||||
}
|
||||
|
||||
public _removeAll(rows: RowList) {
|
||||
for (const r of rows) { this.rows.delete(r); }
|
||||
for (const r of rows) { this._rows.delete(r); }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user