Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix syntax highlighting by bumping onigasm #7610

Merged
merged 1 commit into from
Apr 20, 2020

Conversation

llebout
Copy link

@llebout llebout commented Apr 19, 2020

What it does

onigasm version requirement was tightened at cd3a35a to fix syntax highlighting but that did not work for me with Rust code. I assume the bug is now fixed upstream, onigasm latest version of 2.x series being 2.2.4.

How to test

Copy this folder: https://github.com/microsoft/vscode/tree/master/extensions/rust into Theia's tree plugins folder

Run Theia e.g. yarn start:browser

Open: http://localhost:3000

Observe syntax highlighting of a Rust project, e.g. clone: https://github.com/BurntSushi/ripgrep

Review checklist

Reminder for reviewers

@llebout
Copy link
Author

llebout commented Apr 19, 2020

CI says:

ERR: The git repository state changed after the build, this should not happen.
HEAD detached at FETCH_HEAD
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
	modified:   yarn.lock
no changes added to commit (use "git add" and/or "git commit -a")
HINT: Did you update and commit your 'yarn.lock' ?

I think this is normal that it happens?

@benoitf
Copy link
Contributor

benoitf commented Apr 19, 2020

you need to add yarn.lock changes in your pull request

@llebout
Copy link
Author

llebout commented Apr 20, 2020

@benoitf unfortunately I can't do this because yarn doesnt support generating the lock file without installing. I am on a machine with an IBM POWER CPU and while this change fixes the issue on a git tree of mine (where I remove the electron dependency that doesnt exist for IBM POWER), Theia's tree wont work as-is on my machine.

You have permission to commit to my branch as I allowed it, so feel free to.

@akosyakov akosyakov self-assigned this Apr 20, 2020
@akosyakov akosyakov added the vscode issues related to VSCode compatibility label Apr 20, 2020
@akosyakov
Copy link
Member

akosyakov commented Apr 20, 2020

@Leo-LB I will do it.

fyi you could use Gitpod to correct commits: https://gitpod.io#https://github.com/eclipse-theia/theia/pull/7610

onigasm version requirement was tightened at
cd3a35a to fix syntax
highlighting but that did not work for me with Rust code.

I assume the bug is now fixed upstream, onigasm latest version
of 2.x series being 2.2.4.

Co-authored-by: Anton Kosyakov <[email protected]>
Signed-off-by: Leo Le Bouter <[email protected]>
Copy link
Member

@akosyakov akosyakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've verified:

@akosyakov
Copy link
Member

merging, build failure is not related to the PR, i will do another PR to fix CI

@akosyakov akosyakov merged commit 983644d into eclipse-theia:master Apr 20, 2020
@llebout
Copy link
Author

llebout commented Apr 20, 2020

Thanks a lot @akosyakov! And right, will think about Gitpod next time! Though I'm not a fan of giving my Github credentials to it. Though I could probably generate the lock file there and transfer it locally.

@akosyakov
Copy link
Member

akosyakov commented Apr 20, 2020

Though I'm not a fan of giving my Github credentials to it.

Gitpod does not take your credentials, but only GH token you control what such token can do. Similar to all other tools like Travis, Circle CI and so on. By default it only requires access to email for login. Obviously to push you will be asked to upgrade GH token to write access for public repos.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
vscode issues related to VSCode compatibility
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants