enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 07:51:56 +03:00
Code Issues Projects Releases Wiki Activity

Run typecheck and eslint on ./run lint (#6314)

Browse Source
This commit is contained in:
somebody1234 2023-05-04 14:00:42 +10:00 committed by GitHub
parent b93edb050b
commit 7885145b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/ide-desktop/lib/client/src/file-associations.ts
View File

@ -104,7 +104,7 @@ export function isFileOpenable(path: string): boolean {
* we manually start a new instance of the application and pass the file path to it (using the * we manually start a new instance of the application and pass the file path to it (using the
* Windows-style command). * Windows-style command).
*/ */
export function onFileOpened(event: Event, path: string): string | void { export function onFileOpened(event: Event, path: string): string | null {
logger.log(`Received 'open-file' event for path '${path}'.`) logger.log(`Received 'open-file' event for path '${path}'.`)
if (isFileOpenable(path)) { if (isFileOpenable(path)) {
logger.log(`The file '${path}' is openable.`) logger.log(`The file '${path}' is openable.`)
@ -114,7 +114,6 @@ export function onFileOpened(event: Event, path: string): string | void {
if (!electron.app.isReady() && CLIENT_ARGUMENTS.length === 0) { if (!electron.app.isReady() && CLIENT_ARGUMENTS.length === 0) {
event.preventDefault() event.preventDefault()
logger.log(`Opening file '${path}'.`) logger.log(`Opening file '${path}'.`)
// eslint-disable-next-line no-restricted-syntax
return handleOpenFile(path) return handleOpenFile(path)
} else { } else {
// We need to start another copy of the application, as the first one is already running. // We need to start another copy of the application, as the first one is already running.
@ -128,9 +127,11 @@ export function onFileOpened(event: Event, path: string): string | void {
}) })
// Prevent parent (this) process from waiting for the child to exit. // Prevent parent (this) process from waiting for the child to exit.
child.unref() child.unref()
return null
} }
} else { } else {
logger.log(`The file '${path}' is not openable, ignoring the 'open-file' event.`) logger.log(`The file '${path}' is not openable, ignoring the 'open-file' event.`)
return null
} }
} }

6
build/cli/src/lib.rs
View File

@ -86,6 +86,8 @@ use ide_ci::programs::git;
use ide_ci::programs::git::clean; use ide_ci::programs::git::clean;
use ide_ci::programs::rustc; use ide_ci::programs::rustc;
use ide_ci::programs::Cargo; use ide_ci::programs::Cargo;
use ide_ci::programs::Npm;
use ide_ci::programs::Npx;
use std::time::Duration; use std::time::Duration;
use tempfile::tempdir; use tempfile::tempdir;
use tokio::process::Child; use tokio::process::Child;
@ -835,6 +837,10 @@ pub async fn main_internal(config: Option<enso_build::config::Config>) -> Result
.await?; .await?;
prettier::check(&ctx.repo_root).await?; prettier::check(&ctx.repo_root).await?;
let js_modules_root = ctx.repo_root.join("app/ide-desktop");
Npm.cmd()?.current_dir(&js_modules_root).args(["install"]).run_ok().await?;
Npm.cmd()?.current_dir(&js_modules_root).args(["run", "typecheck"]).run_ok().await?;
Npx.cmd()?.current_dir(&js_modules_root).args(["eslint", "."]).run_ok().await?;
} }
Target::Fmt => { Target::Fmt => {
let prettier = prettier::write(&ctx.repo_root); let prettier = prettier::write(&ctx.repo_root);