GH-3254: Fixed the incomplete logic when checking if running in Electron #3264
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
409ca6e to
64d9adc
Compare
|
Reviewers, please do not do anything until my next notice. It is still in development, I had to create the PR. Thanks! |
- `is-electron` checks only the `process.versions.electron` in Node.js. - `process.versions` is not set/inherited when calling: - `child_process.fork` or - `cluster.fork`. - Extended the `is-electron` logic to verify `process.env` as well. Closes: #3254. Signed-off-by: Akos Kitta <kittaakos@typefox.io>
|
It is ready for the review. I am doing another verification cycle:
|
👍 Done. It works nicely. Before: After: |
|
I am getting the following errors when starting electron in my local env: It could just be me. I asked @vince-fugnitto to check if it happens in his env. |
I'm confirming that it's happening on my side as well @elaihau |
|
@elaihau, @vince-fugnitto, thank you for checking. It happens on the |
I'll build master and verify if the error is there too and what the reason is. |
|
You can work around it (in debug mode) if you drop (splice) the Perhaps this commit broke it: 64b0b02 CC: @akosyakov |
|
@elaihau @kittaakos I confirmed it occurs in |
|
Wild guess: it is related to the icons. From the error message: |
Maybe its the reason since the |
As I see, it should be the FS path to the actual icon and the not the CSS class name of the icon. I will disable it: diff --git a/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts b/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts
index ea14dbdc..e105ff3e 100644
--- a/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts
+++ b/packages/core/src/electron-browser/menu/electron-main-menu-factory.ts
@@ -100,7 +100,6 @@ export class ElectronMainMenuFactory {
items.push({
id: menu.id,
label: menu.label,
- icon: menu.icon,
type: this.commandRegistry.getToggledHandler(commandId) ? 'checkbox' : 'normal',
checked: this.commandRegistry.isToggled(commandId),
enabled: true, // https://github.com/theia-ide/theia/issues/446 |
Follow-up: #3268 |
We cannot use the CSS class name of the `font-awesome` icons. Signed-off-by: Akos Kitta <kittaakos@typefox.io>
your patch for the icons works well ! |
|
UI test failed looks like it is not related to this change |
|
Akos I stole your 2nd commit #3280 @kittaakos |
elaihau
approved these changes
Oct 26, 2018
Yes, a restart helped. Thanks for the review, I am merging this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
is-electronchecks only theprocess.versions.electronin Node.js.process.versionsis not set/inherited when calling:child_process.forkorcluster.fork.is-electronlogic to verifyprocess.envas well.Closes: #3254.
Closes: #2992.
Signed-off-by: Akos Kitta kittaakos@typefox.io