NodeJs Support, Project path support, Git Conflict support #33

sp3c1 · 2018-04-13T00:27:05Z

Do not know if you want to megre it or use it to make broad support. Some small features.

handling of NodeJs package.json
when in project directory, hides all the path to folder (it becomes like a home dir) - based on git path and current path comparison
used some of the icomoon stuff, fill free to customize (this will require you to set the icomon as the symbols font, and/or as extra font in your IDE if you want to see nice symbols)
stripped the -> origin from the git status check - by reordering

Change to modular structure that was introduced meantime on master.
Also added support for the Git conflict Git Conflict #35

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 · 2018-04-13T11:38:11Z

mattdkerr · 2018-04-19T21:43:00Z

powerline_prompt.lua

 local function get_folder_name(path)
 	local reversePath = string.reverse(path)
 	local slashIndex = string.find(reversePath, "\\")
 	return string.sub(path, string.len(path) - slashIndex + 2)
 end

+local npmIcon = ""


looks like this didn't get saved correctly?

maybe encoding was messed somewhere along the way

not really, set icomoon font in your ide and in your cmder

Dont think github is correctly handling those symbols in the code snippets

mattdkerr

encoding issue?

AmrEldib · 2018-04-19T22:40:48Z

I should mention that I've been working over the past few days (since this PR came in) on a refactor that makes it much easier to add 'addons' like this.
The goal is offload all the clink work to one 'core' file, and only have the addon file (for git, hg, npm, python, etc) call one function to do all this work.
This will also allow adding multiple segments to the prompt for folders that have, say, npm and git, without either addon having to be aware of the other.

mattdkerr · 2018-04-19T23:09:24Z

Sounds great- I could then write in an add-on for #30

AmrEldib · 2018-04-19T23:18:56Z

The Git segment is pulled into its own addon. Only few changes are needed to make #30 happen. It should be good.
I'm also considering adding configurations to let people control some things without changing code

AmrEldib · 2018-04-20T06:45:31Z

I've published the refactored version. I've added an explanation in the core and addon files, but README and a proper docs file are still to be edited. Maybe this weekend, along with merging this npm addon.

sp3c1 · 2018-04-20T10:29:58Z

cool, want me to resolve the conflicts with base branch?

sp3c1 · 2018-04-20T11:16:20Z

@AmrEldib going through new structure and I like it. Was thinking to write one myself like that but was too lazy ;]

Will port changes to that new format, also will extract variables to the config, update the sample file and delete from repo the actual config

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 · 2018-04-21T14:18:54Z

Think thats it, @AmrEldib @mattdkerr review again please

mattdkerr · 2018-04-23T22:59:58Z

powerline_npm.lua

+-- Sets the properties of the Segment object, and prepares for a segment to be added
+---
+local function init()
+  segment.isNeeded = get_package_json_dir()


it would be preferable for get_package_json_dir() to be named something starting with "has"/"is" that indicates it returns a boolean result

as it actually returns something from io.openit should not be prefixed has, I think

mattdkerr · 2018-04-23T23:00:54Z

powerline_prompt.lua

@@ -5,6 +5,9 @@
 local promptTypeFull = "full"
 -- "folder" for folder name only like System32
 local promptTypeFolder = "folder"
+ -- "smart" for treating git top level folder as homeSymbol


mattdkerr · 2018-04-23T23:23:23Z

powerline_npm.lua

+    end
+
+    segment.textColor = colorWhite
+    segment.fillColor = colorCyan


how do we customize this more easily? I can execute clink and this lua under Hyper or Cmder and they each have their own color theme systems

I ve actually tried moving that to config, but it has to be processed after the core and throws errors. Not proficient enough in lua to work around it ;p (and to tell the truth I didnt really look hard)

That said, you can change your color directly in cmder settings can you. And I would actually say this should be probably preferable way to change color themes anyway.

what kind of customizations are you thinking of?
The order of files does affect results. The only ways to force order I can find (but not 100% sure) are:

file names: this is why the config file starts with an underscore, to be loaded before all other files

The number passed to the register_filter function. The higher the number, the later the function is called. This way the folder name can always be first.

I was thinking about actually putting colors into the config. As cmder can handle those extra color codes, but then we could put it in core as well. So i dont know if it is even worth it to extract that.

AmrEldib · 2018-04-24T17:00:01Z

powerline_git.lua

@sp3c1 what is delayGit? and delayNpm?

variable in config - forgot to update the sample one, will send the update
👍

AmrEldib · 2018-04-24T17:17:41Z

powerline_prompt.lua

-		end
-	end
+    else    
+        local git_dir = get_git_dir()


There's an unobvious issue here. get_git_dir is a function is a lua file shipped with Cmder. This function gets overwritten in the powerline_git file. However, I think here we're calling the original function shipped with Cmder which could cause issues later if it changes, or if the powerline_git function diverges from Cmder's
This highlights that powerline_prompt depends on powerline_git, but powerline_git executes after powerline_prompt

that is a piccle, as the git component is quite crucial.

maybe we move it to very beginning to override it so that no addon gonna have same issue. No its not as clean at it could be, but would resolve it and ensure it wont randomly break?

AmrEldib · 2018-04-24T17:18:14Z

@sp3c1 @mattdkerr I appreciate all your work on this.
I do have some questions:

The symbols (which are very nice) require the icomoon font. Either we find symbols that don't require an additional font, or we put clear instructions how to obtain and install this font to make these symbols show up correctly.
I suggest replacing the VS Code symbol with a more generic code symbol like "<>" for people who are not using VS Code as their IDE
I see that constants were moved to the config file. I like giving users control over which symbols to use, but I'm not sure the arrow symbol should be configurable, because the code relies on how it looks.

sp3c1 · 2018-04-24T19:02:35Z

@AmrEldib

Regarding the icomoon I would say lets add isntruction and even screenshot how to set it.
Regarding VS Code, its already changed to git icon - as this effectively works with any git project
Yeah, will move back the arrow (though it would give use ability to use some other arrows etc, but we can keep it locked)

sp3c1 · 2018-04-24T19:44:06Z

Regarding fonts, maybe we should link the https://github.com/ryanoasis/nerd-fonts? I mean anyone should pick whatever he really likes

sp3c1 · 2018-04-25T16:27:58Z

Or actually set this to some normal font in repo with screenshot instructions how to set it to something different?

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 · 2018-05-01T16:26:24Z

@AmrEldib think that covers it

AmrEldib · 2018-05-01T16:32:32Z

@sp3c1 I'm working on this, but been a little busy lately. Thanks again for all your help

sp3c1 · 2018-05-01T16:58:20Z

np ^^

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

AmrEldib · 2018-05-19T04:35:27Z

Sorry for the unplanned delay. I merged all the addon after making some changes to make sure the code adhere to the same style and is all documented.
I've updated the README and screenshots.
I made some changes to how the smart prompt works. It'll show the folder name instead of just the project. This allows showing the folder name when navigating to subfolders.
Thank you @sp3c1 and @mattdkerr for all your help. Much appreciated!

sp3c1 added 3 commits April 13, 2018 00:02

added stuff

1f07725

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

save

8804bb0

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

save

5205cf1

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 changed the title ~~Fork changes~~ NodeJs Support, Project path support Apr 13, 2018

AmrEldib self-assigned this Apr 18, 2018

mattdkerr reviewed Apr 19, 2018

View reviewed changes

AmrEldib added the enhancement label Apr 19, 2018

sp3c1 added 3 commits April 20, 2018 13:56

resolved conflict

f0374e8

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

cleaned the config from repo

9aa2418

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

cleanup the comment

4ea0f01

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

mattdkerr suggested changes Apr 23, 2018

View reviewed changes

mattdkerr approved these changes Apr 24, 2018

View reviewed changes

AmrEldib reviewed Apr 24, 2018

View reviewed changes

sp3c1 added 3 commits April 27, 2018 14:31

review changes

1a7d206

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

Clarification on the modifications

100eb9f

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

resolve conflicts

c0fd4b5

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 added 3 commits April 27, 2018 15:41

testing conflicts

8e986e0

handling of conflicts

ff20760

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

conflicts handling

fe93d6b

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

sp3c1 changed the title ~~NodeJs Support, Project path support~~ NodeJs Support, Project path support, Git Conflict support Apr 27, 2018

formatting

937f803

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

added link to icon fonts

c3c9323

Signed-off-by: Bartlomiej Specjalny <bspecjalny@gmail.com>

mattdkerr approved these changes May 16, 2018

View reviewed changes

AmrEldib closed this May 19, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NodeJs Support, Project path support, Git Conflict support #33

NodeJs Support, Project path support, Git Conflict support #33

sp3c1 commented Apr 13, 2018 •

edited

Loading

sp3c1 commented Apr 13, 2018

mattdkerr Apr 19, 2018

AmrEldib Apr 19, 2018

sp3c1 Apr 20, 2018 •

edited

Loading

mattdkerr left a comment

AmrEldib commented Apr 19, 2018

mattdkerr commented Apr 19, 2018

AmrEldib commented Apr 19, 2018

AmrEldib commented Apr 20, 2018

sp3c1 commented Apr 20, 2018

sp3c1 commented Apr 20, 2018

sp3c1 commented Apr 21, 2018

mattdkerr Apr 23, 2018

sp3c1 Apr 24, 2018

mattdkerr Apr 23, 2018

mattdkerr Apr 23, 2018

sp3c1 Apr 24, 2018

AmrEldib Apr 24, 2018

sp3c1 Apr 26, 2018

AmrEldib Apr 24, 2018

sp3c1 Apr 24, 2018 •

edited

Loading

AmrEldib Apr 24, 2018

sp3c1 Apr 24, 2018 •

edited

Loading

AmrEldib commented Apr 24, 2018

sp3c1 commented Apr 24, 2018 •

edited

Loading

sp3c1 commented Apr 24, 2018

sp3c1 commented Apr 25, 2018

sp3c1 commented May 1, 2018

AmrEldib commented May 1, 2018

sp3c1 commented May 1, 2018

AmrEldib commented May 19, 2018

NodeJs Support, Project path support, Git Conflict support #33

NodeJs Support, Project path support, Git Conflict support #33

Conversation

sp3c1 commented Apr 13, 2018 • edited Loading

sp3c1 commented Apr 13, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sp3c1 Apr 20, 2018 • edited Loading

Choose a reason for hiding this comment

mattdkerr left a comment

Choose a reason for hiding this comment

AmrEldib commented Apr 19, 2018

mattdkerr commented Apr 19, 2018

AmrEldib commented Apr 19, 2018

AmrEldib commented Apr 20, 2018

sp3c1 commented Apr 20, 2018

sp3c1 commented Apr 20, 2018

sp3c1 commented Apr 21, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sp3c1 Apr 24, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sp3c1 Apr 24, 2018 • edited Loading

Choose a reason for hiding this comment

AmrEldib commented Apr 24, 2018

sp3c1 commented Apr 24, 2018 • edited Loading

sp3c1 commented Apr 24, 2018

sp3c1 commented Apr 25, 2018

sp3c1 commented May 1, 2018

AmrEldib commented May 1, 2018

sp3c1 commented May 1, 2018

AmrEldib commented May 19, 2018

sp3c1 commented Apr 13, 2018 •

edited

Loading

sp3c1 Apr 20, 2018 •

edited

Loading

sp3c1 Apr 24, 2018 •

edited

Loading

sp3c1 Apr 24, 2018 •

edited

Loading

sp3c1 commented Apr 24, 2018 •

edited

Loading