Merge pull request #224 from ZahraTee/fix-lint-errors

nrc · web-flow · commit 800f9098504a · 2018-05-13T11:27:41.000+12:00
(209) Fix ESLint errors
diff --git a/static/.eslintrc b/static/.eslintrc
@@ -1,11 +1,15 @@
 {
-  "globals": {},
+  "globals": {
+    "CONFIG": true,
+    "CHAR_WIDTH": true
+  },
   "env": {
     "browser": true,
     "jquery": true
   },
   "rules": {
-    "react/prop-types": 0
+    "react/prop-types": 0,
+    "no-console": 0
   },
   "plugins": [
     "react",
diff --git a/static/app.js b/static/app.js
@@ -8,9 +8,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter, Route, Switch } from 'react-router-dom';
+import { BrowserRouter, Route } from 'react-router-dom';
 
-import * as utils from './utils';
+import { request } from './utils';
 import { Sidebar } from './sidebar';
 import { makeTreeData } from './symbolPanel';
 import { ContentPanel, Page } from './contentPanel';
@@ -38,7 +38,7 @@ export class RustwApp extends React.Component {
 
     loadFileTreeData() {
         let self = this;
-        utils.request(
+        request(
             'tree/' + CONFIG.workspace_root.replace('\\', '/'),
             function(json) {
                 if (json.Directory) {
@@ -55,7 +55,7 @@ export class RustwApp extends React.Component {
 
     loadSymbols() {
         const self = this;
-        utils.request(
+        request(
             'symbol_roots',
             function(json) {
                 self.setState({ symbols: makeTreeData(json) });
@@ -67,7 +67,7 @@ export class RustwApp extends React.Component {
 
     refreshStatus() {
         const self = this;
-        utils.request(
+        request(
             "status",
             function (data) {
                 self.setState({ status: data.status });
@@ -80,7 +80,7 @@ export class RustwApp extends React.Component {
 
     getSearch(needle) {
         const self = this;
-        return utils.request(
+        return request(
             'search?needle=' + needle,
             function(json) {
                 self.refreshStatus();
@@ -93,7 +93,7 @@ export class RustwApp extends React.Component {
 
     getUses(needle) {
         const self = this;
-        return utils.request(
+        return request(
             'search?id=' + needle,
             function(json) {
                 self.refreshStatus();
@@ -106,7 +106,7 @@ export class RustwApp extends React.Component {
 
     getImpls(needle) {
         const self = this;
-        return utils.request(
+        return request(
             'find?impls=' + needle,
             function(json) {
                 self.refreshStatus();
diff --git a/static/contentPanel.js b/static/contentPanel.js
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { DirView } from './dirView';
 import { SourceView } from './srcView';
-const utils = require('./utils');
+import { request } from './utils';
 
 export const Page = {
     START: 'START',
@@ -51,7 +51,7 @@ export class ContentPanel extends React.Component {
         const app = this.props.app;
         const self = this;
 
-        utils.request(
+        request(
             'src/' + path,
             function(json) {
                 if (json.Directory) {
diff --git a/static/menus.js b/static/menus.js
@@ -74,7 +74,7 @@ export class MenuHost extends React.Component {
 
     render() {
         let menu = null;
-        if (!!this.state.menuOpen) {
+        if (this.state.menuOpen) {
             const onClose = () => this.setState({ menuOpen: null});
             menu = React.createElement(this.menuFn, { location: this.state.menuOpen, onClose: onClose, target: this.state.menuOpen.target, callbacks: this.props.callbacks });
         }
diff --git a/static/search.js b/static/search.js
@@ -7,8 +7,7 @@
 // except according to those terms.
 
 import React from 'react';
-
-const utils = require('./utils');
+import { highlight_spans } from './utils';
 
 class ResultSet extends React.Component {
     componentDidMount() {
@@ -157,7 +156,7 @@ function highlight_needle(results, tag) {
     results.map((file, index) => {
         file.lines.map((line) => {
             line.line_end = line.line_start;
-            utils.highlight_spans(line,
+            highlight_spans(line,
                                   null,
                                   `snippet_line_${tag}_${index}_`,
                                   "selected_search");
diff --git a/static/srcView.js b/static/srcView.js
@@ -7,7 +7,6 @@
 // except according to those terms.
 
 import React from 'react';
-import ReactDOM from 'react-dom';
 
 import * as utils from './utils';
 import { BreadCrumbs } from './breadCrumbs';
@@ -91,7 +90,7 @@ function view_in_vcs(target) {
 function edit(target) {
     utils.request(
         'edit?file=' + target.dataset.link,
-        function(json) {
+        function() {
             console.log("edit - success");
         },
         "Error with search edit",
@@ -113,7 +112,7 @@ export class SourceView extends React.Component {
 
     componentDidUpdate() {
         if (this.props.highlight) {
-            utils.highlight_spans(this.props.highlight, "src_line_number_", "src_line_", "selected", ReactDOM.findDOMNode(this));
+            utils.highlight_spans(this.props.highlight, "src_line_number_", "src_line_", "selected", this.node);
         }
 
         // Make source links active.
@@ -161,15 +160,15 @@ export class SourceView extends React.Component {
             });
 
         let refMenu = null;
-        if (!!this.state.refMenu) {
+        if (this.state.refMenu) {
             const onClose = () => {
                 return this.setState({ refMenu: null });
             };
 
             refMenu = <RefMenu app={this.props.app} location={this.state.refMenu} onClose={onClose} target={this.state.refMenu.target} id={this.state.refMenu.id} />;
         }
 
-        return <div id="src"> 
+        return <div id="src" ref={node => this.node = node}> 
             <BreadCrumbs app={this.props.app} path={this.props.path} />
             <div id="div_src_view">
                 <div id="div_src_contents">
diff --git a/static/symbolPanel.js b/static/symbolPanel.js
@@ -8,8 +8,7 @@
 
 import React from 'react';
 import { Treebeard } from 'react-treebeard';
-
-const utils = require('./utils');
+import { request } from './utils';
 
 // FIXME share code with treePanel
 
@@ -46,7 +45,7 @@ export class SymbolPanel extends React.Component {
 
         // Get any children from the server and add them to the tree.
         if (node.symId && (!node.children || node.children.length == 0)) {
-            utils.request(
+            request(
                 'symbol_children?id=' + node.symId,
                 function(json) {
                     // FIXME? We are mutating the state of app here, I'm pretty sure this is bad practice.
diff --git a/static/utils.js b/static/utils.js
@@ -24,7 +24,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,
     }
 
     if (line_number_prefix) {
-        for (var i = highlight.line_start; i <= highlight.line_end; ++i) {
+        for (let i = highlight.line_start; i <= highlight.line_end; ++i) {
             $("#" + line_number_prefix + i).addClass(css_class);
         }
     }
@@ -34,7 +34,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,
     }
 
     // Highlight all of the middle lines.
-    for (var i = highlight.line_start + 1; i <= highlight.line_end - 1; ++i) {
+    for (let i = highlight.line_start + 1; i <= highlight.line_end - 1; ++i) {
         $("#" + src_line_prefix + i).addClass(css_class);
     }
 
@@ -45,8 +45,8 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,
         $("#" + src_line_prefix + highlight.line_end).addClass(css_class);
     } else {
         // First line
-        var lhs = (highlight.column_start - 1);
-        var rhs = 0;
+        const lhs = (highlight.column_start - 1);
+        let rhs = 0;
         if (highlight.line_end === highlight.line_start && highlight.column_end > 0) {
             // If we're only highlighting one line, then the highlight must stop
             // before the end of the line.
@@ -56,7 +56,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,
 
         // Last line
         if (highlight.line_end > highlight.line_start) {
-            var rhs = 0;
+            rhs = 0;
             if (highlight.column_end > 0) {
                 rhs = (highlight.column_end - 1);
             }
@@ -80,12 +80,12 @@ export function request(urlStr, success, errStr, app) {
         console.log(errStr);
         console.log("error: " + errorThrown + "; status: " + status);
 
-        if (!!app) {
+        if (app) {
             app.showError();
         }
     });
 
-    if (!!app) {
+    if (app) {
         app.showLoading();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ export class MenuHost extends React.Component {`
`74`	`74`
`75`	`75`	`render() {`
`76`	`76`	`let menu = null;`
`77`		`- if (!!this.state.menuOpen) {`
	`77`	`+ if (this.state.menuOpen) {`
`78`	`78`	`const onClose = () => this.setState({ menuOpen: null});`
`79`	`79`	`menu = React.createElement(this.menuFn, { location: this.state.menuOpen, onClose: onClose, target: this.state.menuOpen.target, callbacks: this.props.callbacks });`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`if (line_number_prefix) {`
`27`		`- for (var i = highlight.line_start; i <= highlight.line_end; ++i) {`
	`27`	`+ for (let i = highlight.line_start; i <= highlight.line_end; ++i) {`
`28`	`28`	`$("#" + line_number_prefix + i).addClass(css_class);`
`29`	`29`	`}`
`30`	`30`	`}`
`@@ -34,7 +34,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Highlight all of the middle lines.`
`37`		`- for (var i = highlight.line_start + 1; i <= highlight.line_end - 1; ++i) {`
	`37`	`+ for (let i = highlight.line_start + 1; i <= highlight.line_end - 1; ++i) {`
`38`	`38`	`$("#" + src_line_prefix + i).addClass(css_class);`
`39`	`39`	`}`
`40`	`40`
`@@ -45,8 +45,8 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,`
`45`	`45`	`$("#" + src_line_prefix + highlight.line_end).addClass(css_class);`
`46`	`46`	`} else {`
`47`	`47`	`// First line`
`48`		`- var lhs = (highlight.column_start - 1);`
`49`		`- var rhs = 0;`
	`48`	`+ const lhs = (highlight.column_start - 1);`
	`49`	`+ let rhs = 0;`
`50`	`50`	`if (highlight.line_end === highlight.line_start && highlight.column_end > 0) {`
`51`	`51`	`// If we're only highlighting one line, then the highlight must stop`
`52`	`52`	`// before the end of the line.`
`@@ -56,7 +56,7 @@ export function highlight_spans(highlight, line_number_prefix, src_line_prefix,`
`56`	`56`
`57`	`57`	`// Last line`
`58`	`58`	`if (highlight.line_end > highlight.line_start) {`
`59`		`- var rhs = 0;`
	`59`	`+ rhs = 0;`
`60`	`60`	`if (highlight.column_end > 0) {`
`61`	`61`	`rhs = (highlight.column_end - 1);`
`62`	`62`	`}`
`@@ -80,12 +80,12 @@ export function request(urlStr, success, errStr, app) {`
`80`	`80`	`console.log(errStr);`
`81`	`81`	`console.log("error: " + errorThrown + "; status: " + status);`
`82`	`82`
`83`		`- if (!!app) {`
	`83`	`+ if (app) {`
`84`	`84`	`app.showError();`
`85`	`85`	`}`
`86`	`86`	`});`
`87`	`87`
`88`		`- if (!!app) {`
	`88`	`+ if (app) {`
`89`	`89`	`app.showLoading();`
`90`	`90`	`}`
`91`	`91`	`}`