Merge pull request #895 from meeseeksmachine/auto-backport-of-pr-892-on-jlab-2

fcollonval · web-flow · commit ebd1b127b3e3 · 2021-03-07T13:00:08.000+01:00
Backport PR #892 on branch jlab-2 (Remove eslint warnings)
diff --git a/src/commandsAndMenu.tsx b/src/commandsAndMenu.tsx
@@ -115,7 +115,7 @@ export function addCommands(
   fileBrowser: FileBrowser,
   settings: ISettingRegistry.ISettings,
   renderMime: IRenderMimeRegistry
-) {
+): void {
   const { commands, shell } = app;
 
   /**
diff --git a/src/components/Feedback.tsx b/src/components/Feedback.tsx
@@ -89,7 +89,7 @@ export class Feedback extends React.Component<IFeedbackProps, IFeedbackState> {
     return state;
   }
 
-  render() {
+  render(): JSX.Element {
     if (this.state.logStack.length > 1) {
       setTimeout(() => {
         if (this.state.logStack.length > 1) {
diff --git a/src/components/FileList.tsx b/src/components/FileList.tsx
@@ -115,7 +115,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   openContextMenu = (
     selectedFile: Git.IStatusFile,
     event: React.MouseEvent
-  ) => {
+  ): void => {
     event.preventDefault();
 
     this.setState({
@@ -138,7 +138,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   openSimpleContextMenu = (
     selectedFile: Git.IStatusFile,
     event: React.MouseEvent
-  ) => {
+  ): void => {
     event.preventDefault();
 
     const contextMenu = new Menu({ commands: this.props.commands });
@@ -148,25 +148,25 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   };
 
   /** Reset all staged files */
-  resetAllStagedFiles = async (event: React.MouseEvent) => {
+  resetAllStagedFiles = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
     await this.props.model.reset();
   };
 
   /** Reset a specific staged file */
-  resetStagedFile = async (file: string) => {
+  resetStagedFile = async (file: string): Promise<void> => {
     await this.props.model.reset(file);
   };
 
   /** Add all unstaged files */
-  addAllUnstagedFiles = async (event: React.MouseEvent) => {
+  addAllUnstagedFiles = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
 
     await this.props.model.addAllUnstaged();
   };
 
   /** Discard changes in all unstaged files */
-  discardAllUnstagedFiles = async (event: React.MouseEvent) => {
+  discardAllUnstagedFiles = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
 
     const result = await showDialog({
@@ -185,7 +185,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   };
 
   /** Discard changes in all unstaged and staged files */
-  discardAllChanges = async (event: React.MouseEvent) => {
+  discardAllChanges = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
     const result = await showDialog({
       title: 'Discard all changes',
@@ -203,39 +203,39 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   };
 
   /** Add a specific unstaged file */
-  addFile = async (...file: string[]) => {
+  addFile = async (...file: string[]): Promise<void> => {
     await this.props.model.add(...file);
   };
 
   /** Discard changes in a specific unstaged or staged file */
-  discardChanges = async (file: Git.IStatusFile) => {
+  discardChanges = async (file: Git.IStatusFile): Promise<void> => {
     await this.props.commands.execute(ContextCommandIDs.gitFileDiscard, ({
       files: [file]
     } as CommandArguments.IGitContextAction) as any);
   };
 
   /** Add all untracked files */
-  addAllUntrackedFiles = async (event: React.MouseEvent) => {
+  addAllUntrackedFiles = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
     await this.props.model.addAllUntracked();
   };
 
-  addAllMarkedFiles = async () => {
+  addAllMarkedFiles = async (): Promise<void> => {
     await this.addFile(...this.markedFiles.map(file => file.to));
   };
 
-  updateSelectedFile = (file: Git.IStatusFile | null) => {
+  updateSelectedFile = (file: Git.IStatusFile | null): void => {
     this.setState({ selectedFile: file });
   };
 
-  get markedFiles() {
+  get markedFiles(): Git.IStatusFile[] {
     return this.props.files.filter(file => this.props.model.getMark(file.to));
   }
 
   /**
    * Render the modified files
    */
-  render() {
+  render(): JSX.Element {
     if (this.props.settings.composite['simpleStaging']) {
       return (
         <div className={fileListWrapperClass}>
diff --git a/src/components/GitPanel.tsx b/src/components/GitPanel.tsx
@@ -162,7 +162,7 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
     Signal.clearData(this);
   }
 
-  refreshBranch = async () => {
+  refreshBranch = async (): Promise<void> => {
     const { currentBranch } = this.props.model;
 
     this.setState({
@@ -171,7 +171,7 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
     });
   };
 
-  refreshHistory = async () => {
+  refreshHistory = async (): Promise<void> => {
     if (this.props.model.pathRepository !== null) {
       // Get git log for current branch
       const logData = await this.props.model.log(
@@ -191,7 +191,7 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
   /**
    * Refresh widget, update all content
    */
-  refreshView = async () => {
+  refreshView = async (): Promise<void> => {
     if (this.props.model.pathRepository !== null) {
       await this.refreshBranch();
       await this.refreshHistory();
diff --git a/src/components/TagMenu.tsx b/src/components/TagMenu.tsx
@@ -134,7 +134,7 @@ export class TagMenu extends React.Component<ITagMenuProps, ITagMenuState> {
     };
   }
 
-  componentDidMount() {
+  componentDidMount(): void {
     this.props.model
       .tags()
       .then(response => {
diff --git a/src/components/diff/Diff.tsx b/src/components/diff/Diff.tsx
@@ -43,7 +43,7 @@ export interface IDiffProps {
  * The parent diff component which maintains a registry of various diff providers.
  * Based on the extension of the file, it delegates to the relevant diff provider.
  */
-export function Diff(props: IDiffProps) {
+export function Diff(props: IDiffProps): JSX.Element {
   const fileExtension = PathExt.extname(props.path).toLocaleLowerCase();
   if (fileExtension in DIFF_PROVIDER_REGISTRY) {
     const DiffProvider = DIFF_PROVIDER_REGISTRY[fileExtension];
diff --git a/src/components/diff/NBDiffHeader.tsx b/src/components/diff/NBDiffHeader.tsx
@@ -11,7 +11,7 @@ export interface INBDiffHeaderProps {
  * being rendered. Shows the path to the file and the previous and current ref
  * being used for the diff.
  */
-export function NBDiffHeader(props: INBDiffHeaderProps) {
+export function NBDiffHeader(props: INBDiffHeaderProps): JSX.Element {
   return (
     <div>
       <div className="jp-git-diff-header-path">{props.path}</div>
diff --git a/src/components/diff/NbDiff.tsx b/src/components/diff/NbDiff.tsx
@@ -65,7 +65,7 @@ export class CellDiff extends React.Component<ICellDiffProps> {
     }
   }
 
-  render() {
+  render(): JSX.Element {
     const chunk = this.props.cellChunk;
     return (
       <RenderMimeConsumer>
@@ -119,11 +119,11 @@ export class NBDiff extends React.Component<IDiffProps, INBDiffState> {
     };
   }
 
-  componentDidMount() {
+  componentDidMount(): void {
     this.performDiff(this.props.diffContext);
   }
 
-  render() {
+  render(): JSX.Element {
     if (this.state.errorMessage !== undefined) {
       return (
         <div>
diff --git a/src/components/diff/PlainTextDiff.tsx b/src/components/diff/PlainTextDiff.tsx
@@ -31,11 +31,11 @@ export class PlainTextDiff extends React.Component<
     this._mergeViewRef = React.createRef<HTMLDivElement>();
   }
 
-  componentDidMount() {
+  componentDidMount(): void {
     this._performDiff(this.props.diffContext);
   }
 
-  render() {
+  render(): JSX.Element {
     if (this.state.errorMessage !== null) {
       return (
         <div>
diff --git a/src/components/diff/mergeview.ts b/src/components/diff/mergeview.ts
@@ -1869,13 +1869,22 @@ namespace Private {
     }
   }
 
-  export function posMin(a: CodeMirror.Position, b: CodeMirror.Position) {
+  export function posMin(
+    a: CodeMirror.Position,
+    b: CodeMirror.Position
+  ): CodeMirror.Position {
     return (a.line - b.line || a.ch - b.ch) < 0 ? a : b;
   }
-  export function posMax(a: CodeMirror.Position, b: CodeMirror.Position) {
+  export function posMax(
+    a: CodeMirror.Position,
+    b: CodeMirror.Position
+  ): CodeMirror.Position {
     return (a.line - b.line || a.ch - b.ch) > 0 ? a : b;
   }
-  export function posEq(a: CodeMirror.Position, b: CodeMirror.Position) {
+  export function posEq(
+    a: CodeMirror.Position,
+    b: CodeMirror.Position
+  ): boolean {
     return a.line == b.line && a.ch == b.ch;
   }
 
@@ -1907,7 +1916,12 @@ namespace Private {
     }
   }
 
-  export function goNearbyDiff(cm: CodeMirror.Editor, dir: number) {
+  export function goNearbyDiff(
+    cm: CodeMirror.Editor,
+    dir: number
+  ): void | {
+    toString(): 'CodeMirror.PASS';
+  } {
     let found = null;
     const views = cm.state.diffViews;
     // @ts-ignore
diff --git a/src/logger.ts b/src/logger.ts
@@ -22,7 +22,7 @@ export class Logger {
    *
    * @param message Log message
    */
-  log(message: ILogMessage) {
+  log(message: ILogMessage): void {
     this._signal.emit(message);
   }
 
diff --git a/src/model.ts b/src/model.ts
@@ -70,14 +70,14 @@ export class GitExtension implements IGitExtension {
   /**
    * Branch list for the current repository.
    */
-  get branches() {
+  get branches(): Git.IBranch[] {
     return this._branches;
   }
 
   /**
    * The current repository branch.
    */
-  get currentBranch() {
+  get currentBranch(): Git.IBranch {
     return this._currentBranch;
   }
 
@@ -1032,7 +1032,7 @@ export class GitExtension implements IGitExtension {
    * @param fname - filename
    * @param mark - mark to set
    */
-  addMark(fname: string, mark: boolean) {
+  addMark(fname: string, mark: boolean): void {
     this._currentMarker.add(fname, mark);
   }
 
@@ -1051,7 +1051,7 @@ export class GitExtension implements IGitExtension {
    *
    * @param fname - filename
    */
-  toggleMark(fname: string) {
+  toggleMark(fname: string): void {
     this._currentMarker.toggle(fname);
   }
 
@@ -1148,7 +1148,7 @@ export class GitExtension implements IGitExtension {
   /**
    * Clear repository status
    */
-  protected _clearStatus() {
+  protected _clearStatus(): void {
     this._status = {
       branch: null,
       remote: null,
@@ -1193,7 +1193,7 @@ export class GitExtension implements IGitExtension {
    *
    * @param v - repository status
    */
-  protected _setStatus(v: Git.IStatus) {
+  protected _setStatus(v: Git.IStatus): void {
     this._status = v;
     this._statusChanged.emit(this._status);
   }
@@ -1326,22 +1326,22 @@ export class GitExtension implements IGitExtension {
 export class BranchMarker implements Git.IBranchMarker {
   constructor(private _refresh: () => void) {}
 
-  add(fname: string, mark = true) {
+  add(fname: string, mark = true): void {
     if (!(fname in this._marks)) {
       this.set(fname, mark);
     }
   }
 
-  get(fname: string) {
+  get(fname: string): boolean {
     return this._marks[fname];
   }
 
-  set(fname: string, mark: boolean) {
+  set(fname: string, mark: boolean): void {
     this._marks[fname] = mark;
     this._refresh();
   }
 
-  toggle(fname: string) {
+  toggle(fname: string): void {
     this.set(fname, !this._marks[fname]);
   }
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -34,6 +34,6 @@ export function decodeStage(x: string, y: string): Git.Status {
  * @param ms - duration (in milliseconds)
  * @returns a promise
  */
-export function sleep(ms: number) {
+export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
diff --git a/src/widgets/StatusWidget.ts b/src/widgets/StatusWidget.ts
@@ -86,7 +86,9 @@ namespace Private {
    * @param widget - status widget
    * @returns callback
    */
-  export function createEventCallback(widget: StatusWidget) {
+  export function createEventCallback(
+    widget: StatusWidget
+  ): (model: IGitExtension, event: string) => void {
     return onEvent;
 
     /**
@@ -151,7 +153,9 @@ namespace Private {
    * @param settings - extension settings
    * @returns callback
    */
-  export function isStatusWidgetActive(settings?: ISettingRegistry.ISettings) {
+  export function isStatusWidgetActive(
+    settings?: ISettingRegistry.ISettings
+  ): () => boolean {
     return settings ? isActive : inactive;
 
     /**
diff --git a/src/widgets/gitClone.tsx b/src/widgets/gitClone.tsx
@@ -14,7 +14,7 @@ export function addCloneButton(
   model: IGitExtension,
   filebrowser: FileBrowser,
   commands: CommandRegistry
-) {
+): void {
   filebrowser.toolbar.addItem(
     'gitClone',
     ReactWidget.create(

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ export class Feedback extends React.Component<IFeedbackProps, IFeedbackState> {`
`89`	`89`	`return state;`
`90`	`90`	`}`
`91`	`91`
`92`		`- render() {`
	`92`	`+ render(): JSX.Element {`
`93`	`93`	`if (this.state.logStack.length > 1) {`
`94`	`94`	`setTimeout(() => {`
`95`	`95`	`if (this.state.logStack.length > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ export class TagMenu extends React.Component<ITagMenuProps, ITagMenuState> {`
`134`	`134`	`};`
`135`	`135`	`}`
`136`	`136`
`137`		`- componentDidMount() {`
	`137`	`+ componentDidMount(): void {`
`138`	`138`	`this.props.model`
`139`	`139`	`.tags()`
`140`	`140`	`.then(response => {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export class CellDiff extends React.Component<ICellDiffProps> {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- render() {`
	`68`	`+ render(): JSX.Element {`
`69`	`69`	`const chunk = this.props.cellChunk;`
`70`	`70`	`return (`
`71`	`71`	`<RenderMimeConsumer>`
`@@ -119,11 +119,11 @@ export class NBDiff extends React.Component<IDiffProps, INBDiffState> {`
`119`	`119`	`};`
`120`	`120`	`}`
`121`	`121`
`122`		`- componentDidMount() {`
	`122`	`+ componentDidMount(): void {`
`123`	`123`	`this.performDiff(this.props.diffContext);`
`124`	`124`	`}`
`125`	`125`
`126`		`- render() {`
	`126`	`+ render(): JSX.Element {`
`127`	`127`	`if (this.state.errorMessage !== undefined) {`
`128`	`128`	`return (`
`129`	`129`	`<div>`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ export class PlainTextDiff extends React.Component<`
`31`	`31`	`this._mergeViewRef = React.createRef<HTMLDivElement>();`
`32`	`32`	`}`
`33`	`33`
`34`		`- componentDidMount() {`
	`34`	`+ componentDidMount(): void {`
`35`	`35`	`this._performDiff(this.props.diffContext);`
`36`	`36`	`}`
`37`	`37`
`38`		`- render() {`
	`38`	`+ render(): JSX.Element {`
`39`	`39`	`if (this.state.errorMessage !== null) {`
`40`	`40`	`return (`
`41`	`41`	`<div>`
Original file line number	Diff line number	Diff line change
`@@ -1869,13 +1869,22 @@ namespace Private {`
`1869`	`1869`	`}`
`1870`	`1870`	`}`
`1871`	`1871`
`1872`		`- export function posMin(a: CodeMirror.Position, b: CodeMirror.Position) {`
	`1872`	`+ export function posMin(`
	`1873`	`+ a: CodeMirror.Position,`
	`1874`	`+ b: CodeMirror.Position`
	`1875`	`+ ): CodeMirror.Position {`
`1873`	`1876`	`return (a.line - b.line \|\| a.ch - b.ch) < 0 ? a : b;`
`1874`	`1877`	`}`
`1875`		`- export function posMax(a: CodeMirror.Position, b: CodeMirror.Position) {`
	`1878`	`+ export function posMax(`
	`1879`	`+ a: CodeMirror.Position,`
	`1880`	`+ b: CodeMirror.Position`
	`1881`	`+ ): CodeMirror.Position {`
`1876`	`1882`	`return (a.line - b.line \|\| a.ch - b.ch) > 0 ? a : b;`
`1877`	`1883`	`}`
`1878`		`- export function posEq(a: CodeMirror.Position, b: CodeMirror.Position) {`
	`1884`	`+ export function posEq(`
	`1885`	`+ a: CodeMirror.Position,`
	`1886`	`+ b: CodeMirror.Position`
	`1887`	`+ ): boolean {`
`1879`	`1888`	`return a.line == b.line && a.ch == b.ch;`
`1880`	`1889`	`}`
`1881`	`1890`
`@@ -1907,7 +1916,12 @@ namespace Private {`
`1907`	`1916`	`}`
`1908`	`1917`	`}`
`1909`	`1918`
`1910`		`- export function goNearbyDiff(cm: CodeMirror.Editor, dir: number) {`
	`1919`	`+ export function goNearbyDiff(`
	`1920`	`+ cm: CodeMirror.Editor,`
	`1921`	`+ dir: number`
	`1922`	`+ ): void \| {`
	`1923`	`+ toString(): 'CodeMirror.PASS';`
	`1924`	`+ } {`
`1911`	`1925`	`let found = null;`
`1912`	`1926`	`const views = cm.state.diffViews;`
`1913`	`1927`	`// @ts-ignore`