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.

Sign up for GitHub

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

Jump to bottom

Fix #865 #868

Closed
wants to merge 43 commits into from
Closed

Fix #865 #868

wants to merge 43 commits into from

Conversation

protiumx
Copy link
Contributor

@protiumx protiumx commented May 2, 2019

Short description of what this resolves:

Fix #865

Changes proposed in this pull request:

Blackcatz1911 and others added 30 commits September 18, 2018 02:08
@Blackcatz1911 @shanalikhan
Updated: German translation
70d4dc1
@shanalikhan
#641
54752d3
@stripedpajamas @shanalikhan
Add support for VSCodium
38b3b3c
@tkrtmy @shanalikhan
Corrected the message to be displayed
1948e5b
@tkrtmy @shanalikhan
Add Japanese translation file
bef2a5d
@protiumx
=Adding HostName property. Get hostname using 'os.hostname()'
59fb77d
@protiumx
=Need definition for supported OS's. Using strict match regex to get @…
84ba33b 
…sync pragmas. Should it support multiple spaces? Replacing settings.json content before writing file. Should be better removing lines instead of add comments? Replacing settings.json before upload to remove @sync ignore pragms.
@protiumx
Added English message for OSNotSupported message while processing upl…
072ba1c 
…oading content
@protiumx
mocha and chai packages added as dev dependencies. Test script not wo…
fe6db09 
…rking while compiling.
@protiumx
Moving pragma functions to a separated file
3782c76
@protiumx
Added Pragma util static class. Support for host, env and os values i…
9d56d30 
…n every orther. Remove whitespaces before upload. Alert user if OS value is not a valid OS.
@protiumx
Added hostName property to CustomSettings
741351c
@protiumx
Tests files added. Estructure test per feature.
1664358
@protiumx
Added some documentation. hostName property on custom config.
681066e
@protiumx
uncomment lines function. Uncomment all @sync settings before upload.…
ac8be0d 
… Only insert comments if it doesn't match with matchine os or host or env. Uncomment line before write if it matched.
@protiumx
Do replace ments one time per setting pragma. Test uncoment function.…
484ed0d 
… More redeable settings json for testing.
@shanaccelirate
Test Directory
9ba0d02
@protiumx
Merge branch 'v3.2' of https://github.com/shanalikhan/code-settings-sync
a8ed581
@protiumx
Add SUPPORTED_OS and osTypeFromString to environmentPath.ts as reques…
692d2f2 
…ted. Get OS from OsType enum. Remove os.hostName()
@protiumx
Check valid JSON before writting file. All the comments and trilling …
123c68a 
…commas are removed. Must check this. If not valid OS is detected inform user. Added function to remove comments from text.
@protiumx
Chatch exception during upload. Should it abort upload?
517de3d
@protiumx
Adding VS Code tests in typescript. Run test changing launch mode to …
9542ea1 
…"Launch Test". Remove javascript files.
@protiumx
merge with remote master
b0c5c68
@protiumx
Fix bug with the first line of settings.json.
5755226 
Get the local content and extract the ignored lines before writing the new settings. Add the ignored lines at the beginning of the settings object.
@protiumx
Read local file in order to process ignored settings before writing t…
28278a0 
…he file.
@protiumx
Addapt test to changes.
338d9cc
@protiumx
Get tabs or spaces and line breaks for each ignored line.
511f1e0
@MarvinJWendt @shanalikhan
Optimize images (#740)
b4d376d 
*Total -- 20.98kb -> 13.27kb (36.77%)

/images/slack.png -- 13.83kb -> 8.04kb (41.9%)
/images/cloud.png -- 7.15kb -> 5.23kb (26.84%)
@greenkeeper @shanalikhan
fix(package): update temp to version 0.9.0 (#737)
1175578
@protiumx
Merge branch 'v3.2.5' of https://github.com/shanalikhan/code-settings…
b73440e 
…-sync
@protiumx
Remove unnecesary tests
384c8a4
@protiumx
New Approach for parsing pragmas
569e243 
Instead of replacing entires blocks, we will loop each line in the settings file. For each line we are checking if should be ignored or if comments must be toggled. There is a block of code that is repeated to ensure the readability of the code.
@protiumx
Support for Brackets and unifying repeated code
51866a4
@protiumx
Test for multi-line settings supporting curly braces and brackets. Ch…
a52b1a4 
…anging test text extension.
@protiumx
Remove unused function. Add new lines after ignored ettings block.
192049b
@protiumx
Merge tag 'v3.2.5' of https://github.com/shanalikhan/code-settings-sync
f8d5a47
@protiumx
Comments added
33c9924
@protiumx
Merge branch 'v3.3.0' of https://github.com/shanalikhan/code-settings…
4d41e2c 
…-sync
@protiumx
Fix #754
201f802 
The pragma util keeps a copy of the settings that are upload to the
gist. The file is located at <context.globalStoragePath>/settings.sync.

If the content to be upload doesn't deffer from the local content after
taking out the @sync-ignore, the file wont be uploaded.
@protiumx
Fix #754: Sync object
99713af 
Checks the global storage path at constructor.
Checks if the content of the setting file should be uploaded.
@protiumx
Update tests
0d2feac
@protiumx
Fix #865
fe8a458
@protiumx
Fix broken tests
92870a0
@shanalikhan
Copy link
Owner

can you create new PR with your commits only ?

@protiumx
Copy link
Contributor Author

protiumx commented May 2, 2019

Yes, sorry about that

@protiumx protiumx closed this May 3, 2019
@protiumx protiumx deleted the 865 branch May 3, 2019 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@protiumx @shanalikhan @Blackcatz1911 @stripedpajamas @tkrtmy @shanaccelirate @MarvinJWendt