Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Conversation

wheyerstrass
Copy link
Contributor

As dicussed with @akin909 and @hoschi in #1580 I created a styled component that replaces the current dirty-marker. Its background-color can be customized using the configuration key editor.dirtyMarker.userColor, which accepts css color values and defaults to the current themes foreground color.

@akinsho
Copy link
Member

akinsho commented Jul 3, 2018

@wheyerstrass great work on the PR just a couple of notes re. the config option I think we have a couple related to the tab so the marker option would be best grouped with those e.g. tab.dirtyMarker.color re. the failing tests we have some test in place for the tabs under ui-tests/Tabs.test.tsx I think the snapshot will need updating using yarn test:unit:react -u

@wheyerstrass
Copy link
Contributor Author

Looking through the travis-ci log it looks like the job has been terminated because this happens in a loop:

[20094:0704/160417.525607:INFO:CONSOLE(1)] "[REDUX - LANGUAGE][ACTION] CURSOR_MOVED", source: file:///home/travis/build/onivim/oni/dist/linux-unpacked/resources/app/lib/browser/bundle.js (1)
[20094:0704/160417.526410:INFO:CONSOLE(1)] "[REDUX - NeovimEditor0][ACTION] SET_WINDOW_CURSOR", source: file:///home/travis/build/onivim/oni/dist/linux-unpacked/resources/app/lib/browser/bundle.js (1)
[20094:0704/160417.527114:INFO:CONSOLE(1)] "[SyntaxHighlighting.notifyViewportChanged] - bufferId: 1 topLineInView: 484 bottomLineInView: 514", source: file:///home/travis/build/onivim/oni/dist/linux-unpacked/resources/app/lib/browser/bundle.js (1)

Is this a test I can reproduce locally ? yarn run test and yarn test:react pass.
Could this be related to my prior merge with onivim/master ?

@codecov
Copy link

codecov bot commented Jul 4, 2018

Codecov Report

Merging #2391 into master will decrease coverage by <.01%.
The diff coverage is 25%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2391      +/-   ##
==========================================
- Coverage    38.2%   38.19%   -0.01%     
==========================================
  Files         300      300              
  Lines       12518    12522       +4     
  Branches     1647     1649       +2     
==========================================
+ Hits         4782     4783       +1     
- Misses       7481     7484       +3     
  Partials      255      255
Impacted Files Coverage Δ
...src/Services/Configuration/DefaultConfiguration.ts 87.5% <ø> (ø) ⬆️
browser/src/UI/components/Tabs.tsx 30.84% <25%> (-0.23%) ⬇️
browser/src/neovim/NeovimProcessSpawner.ts 21.27% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b12a4f...dbc884f. Read the comment docs.

@akinsho
Copy link
Member

akinsho commented Jul 4, 2018

@wheyerstrass I've re-run the CI test and they pass (they flake out on occasion, which is known were trying to resolve that) thanks for the PR looks good and for making the changes 👍

Copy link
Member

@akinsho akinsho left a comment

Choose a reason for hiding this comment

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

@wheyerstrass just tried this locally and it works really well thanks again

@akinsho akinsho merged commit 3c6f8d4 into onivim:master Jul 4, 2018
@akinsho
Copy link
Member

akinsho commented Jul 4, 2018

Just realised you still had a WIP flag on this lemme know if I jumped the gun and we can revert it and re-open the PR sorry about that should have checked in first

@wheyerstrass
Copy link
Contributor Author

@akin909 I wanted to make the config to dirty-marker component passing more robust, because right now this line:

background-color: ${props => props.userColor || props.theme.foreground}

would fail if userColor === ""
I'd add that and then remove the WIP.

akinsho added a commit that referenced this pull request Jul 4, 2018
@akinsho
Copy link
Member

akinsho commented Jul 4, 2018

@wheyerstrass I can revert the change and you could re-open a PR with the included change or you could add the new change to the updated master and I'll merge that to go with this?

@wheyerstrass
Copy link
Contributor Author

The latter seems the easiest 👍

@akinsho
Copy link
Member

akinsho commented Jul 4, 2018

add the new change in a new PR sorry should have clarified that

@wheyerstrass
Copy link
Contributor Author

I'll make a new PR

@wheyerstrass
Copy link
Contributor Author

@akin909 Ok it looks like it does work as expected. I don't know why
"" | "a" evals to 0 but
a | "a" evals to "a" if a === ""

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants