integration of code-folding extension into brackets #10792

thehogfather · 2015-03-25T09:39:05Z

Integration of core code-folding extension files into brackets' default extension folder.

Florian-R · 2015-03-25T09:47:57Z

Out of curiosity, any reason to not keep this as an extension?

prksingh · 2015-03-25T09:58:30Z

@Florian-R There has been demand to have code folding in the default user experience for brackets. It made sense to reuse an already popular extension to provide this support in core

abose · 2015-03-25T10:04:48Z

@thehogfather Thanks 👍
The Travis CL builds are failing mostly due to JSLint related errors. Could you fix the lint errors and update?

Florian-R · 2015-03-25T10:09:34Z

@prksingh I had hoped that Brackets has kept some sort of Node philosophy, "small core, vibrant userland" but anyway thanks for your input.

thehogfather · 2015-03-25T14:32:29Z

@abose sure thing.

ryanstewart · 2015-03-25T18:25:39Z

@Florian-R in general, that's our philosophy, but code folding has been on our list as "core" for a very long time. Most major editors have it out of the box. It's also far and away one of the most popular extensions, so it was clear that users were missing it.

ryanstewart · 2015-03-26T04:26:32Z

A couple of things we want to do as part of the merge:

Double check the shorts that are used. I think they're probably fine but we should take a look at that.
Move the preferences into our regular preferences system (brackets.json)
Create an option to disable code folding as preference

Open question here: Do we allow separate code folding preferences per project? or just globally? or per file?

MiguelCastillo · 2015-03-27T00:23:42Z

src/extensions/default/CodeFolding/DefaultSettings.js

+		alwaysUseIndentFold: true,
+		enableRegionFolding: true,
+		fadeFoldButtons: false,
+        maxFoldLevel: 2 // this value is only used when fold all is called


NIT: indentation

MiguelCastillo · 2015-03-27T00:51:39Z

@thehogfather It is awesome that you are brining this into brackets!! High-5.

I did not realize how big your extension was! But I did a quick pass and it seems that one glaring inconsistency is the mix of spaces/tabs and that lots of the function are defined right in the module.exports. I am guessing it will be a couple of rounds of tweaks/refactorings to get your extension in line with the rest of brackets. :)

Really happy this is coming in.

thehogfather · 2015-03-27T23:36:14Z

@MiguelCastillo No problem. I'll work on these fixes and update. :)

…some api documentation for functions.

marcelgerber · 2015-03-29T18:48:43Z

You should probably merge your translations (at least the English ones) into our main strings.js as other default extensions do the same.

@marcelgerber

* commit 'e56192e09ceed72834985f2483ed70e339e5c519': Logos are now perfectly centered Whitespace trimming suggested by @marcelgerber Fix some moved APIs that were left over from PR adobe#10641 Text is now perfectly centered

thehogfather · 2015-03-29T22:35:28Z

I've tidied up and refactored a bit based on the suggestions (thanks all). I've moved preferences to brackets.json and merged the english strings into brackets main strings. There is also an option to disable the extension in the settings dialog (should this be on the menu instead - or as well?).

I have translations for fi, fr, ja, nl, pt-br and ru but haven't merged yet. Shall I go ahead and merge those?

nethip · 2015-03-30T06:00:38Z

@thehogfather Please go ahead and merge all the translations for this, barring fr and ja. The fr and ja will need to go through our translation process.

abose · 2015-03-30T19:24:45Z

@thehogfather As i understand, the translations, the HTML dialogs and the menu entries are for the settings dialog for code folding. But as @ryanstewart pointed out in an earlier comment, Brackets doesn't set app preferences with dialogs; But customizable options are set in the preerences file and the default options are set in the 'brackets.json' file in the repo. As the code folding extension is directly integrated with brackets, i think it would be best if it confirms to brackets preferences settings.
So i think we should

delete all the preferences dialogs and related strings and move all configurable settings to brackets.json.
Remove the menu entry for code folding settings
Code folding by default will be enabled for all users. The option to disable code folding can be set as a preferences entry.
@peterflynn @ryanstewart

* commit 'fd6c8acca823e3cf197e6d3ac0ab9adea190843e': (31 commits) Added a newline Adding newline Updating the comments Updating the comments Removing this preference as it should be set to true by default. Changing function name. Decreasing timeout to 4 sec. Adding unit test cases. Submitting changes suggested in PR review. Setting ONE_DAY to correct value. Initially value used for testing was left by mistake. Removing serverTestURL as it is not needed now. Moving lastTimeSentData before making AJAX call to make sure data is not sent before ONE_DAY as setting it to always() will be asynchronous Move the implementation to the extensions. Data will be send to the server as soon as user has launched the Brackets and dialog box prompting for user to opt-in and opt-out is closed. Rework the comments and defects. Test cases has not been added yet. Will be adding to the next PR. Updated by ALF automation. Updated by ALF automation. Extended {APP_NAME} Correcting jshint errors. Deleting duplicate string. Synchronized with latest root commit "developer" -> "pengembang" Fixed text wrapping Add comments.. ... Conflicts: src/nls/root/strings.js

thehogfather · 2015-04-06T15:19:35Z

@MiguelCastillo just pushed an update for all those fixes + merged with the latest commit from master.

@thehogfather

Merge pull request #10792 Code Folding by Patrick Oladimeji; Github:@thehogfather

abose · 2015-04-07T07:38:16Z

@thehogfather Thanks for the help. Merged into master.
Any suggestion on the unit tests that needs to be added?

MiguelCastillo · 2015-04-07T12:49:42Z

@thehogfather yeah man, your last changes look very good. Thank you, this is a great addition to brackets! Now you gotta come up with another really cool extension :)

@abose I really like the idea of adding the package.json for attribution :)

le717 · 2015-04-07T15:11:09Z

Congrats on the merge, @thehogfather! 😄

thehogfather · 2015-04-07T19:16:07Z

👍 thanks all. Glad I could help.

@abose I guess I would mainly check that folded states are persisted and restored correctly, and that the preference options (enabled, minFoldSize etc.) work as intended.

peterflynn · 2015-04-08T01:43:32Z

src/extensions/default/CodeFolding/foldhelpers/foldcode.js

@@ -0,0 +1,268 @@
+/**
+ * Based on http://codemirror.net/addon/fold/foldcode.js
+ * @author Patrick Oladimeji


I think we still need to keep the original copyright from CodeMirror here

abose · 2015-04-08T12:32:51Z

@thehogfather I was verifying the unit tests and some of the integration tests in the unit test setup is failing.
Most is with this message- Cannot read property 'lastIndexOf' of undefined
Could you take a look at debug>run tests>integration>all .

abose · 2015-04-08T12:41:27Z

Code folding is enabled in all files by default, and in some files like txt files it looks a bit odd.
Would it be a good thing to enable code folding in only HTML,XML,js Etc. and disabled in all other file types?

thehogfather · 2015-04-08T22:16:18Z

@abose wrt unit tests, I am unable to run them completely. They freeze with about 125 tests to go. Can you tell me the file throwing the error or show a stack trace? I remember spotting one a while back in one of the imported codeMirror range finders.

abose · 2015-04-09T07:27:06Z

There is a memory issue with the unit tests currently, so we won't be able to run all tests in a single go.
So in order to run it, we have to the tests in individual sections.
First restart brackets; then open test suite, click on integration tab, click on all; it would start running integration tests. If brackets slows down, Restart brackets again to run tests.
In integration test, specifically the following test are failing[ FindInFiles(3 test cases),FindReplace - Integration(1), InlineEditorProviders(3), QuickOpen(3)].
I am checking out these errors and the stack.

But Issue#10857 seems to be much more important than this. My understanding of the extension is limited; it might take a while for me to fix it. Could you take a look at the issue?

peterflynn · 2015-04-09T08:54:41Z

@abose I took a quick look at those unit tests and it seems like the Health Report notification dialog might be causing problems in some of them (you can see it popping up in each test run, even though there's code that should suppress it).

The 3 QuickOpen failures might be different -- I can repro them on my old smart-autocompelte branch (which doesn't have code folding or Health Report), so those failures might be caused by my recent PR there. I can try to take a look tomorrow -- lmk if you find anything out before then.

abose · 2015-04-09T09:00:20Z

The health notifications dialogs will be disabled when unit tests are nunning, but i guess that PR is still under review.
For the time being, it can be disabled by going to HealthDataNotification.js > AppInit.appReady()>
params.parse();if (params.get("testEnvironment")) return;

redmunds · 2015-04-09T14:32:53Z

There's a wiki page with Tips and Tricks for Running Brackets Unit Tests so just add any new tips there and share this link.

pooria-h · 2015-05-28T23:19:53Z

Why there is no option to disable this feature? It's ugly.

le717 · 2015-05-28T23:24:11Z

@pooria-h There is an option. In your brackets.json file, set code-folding.enabled to false. You can get more details on the wiki.

ryanstewart · 2015-05-28T23:26:32Z

Thanks @le717 !

pooria-h · 2015-05-28T23:28:44Z

@le717 Oh I didn't noticed. thanks

integration of code-folding extension into brackets

d298c78

JSHint error fixes

a69a289

MiguelCastillo reviewed Mar 27, 2015
View reviewed changes

thehogfather added 3 commits March 29, 2015 02:40

Refactored extension to use brackets style exports properties. Added …

1fb62d1

…some api documentation for functions.

Moved preferences to brackets.json

4d4029a

Added support for disabling the extension from the preferences dialog.

d9fcb1a

thehogfather added 2 commits March 29, 2015 22:32

Merged english translation strings into nls/root/strings.js

81cb981

nethip assigned abose Mar 30, 2015

Merged language strings for fi, nl, pt-br, ru

f4c7091

thehogfather added 2 commits April 6, 2015 16:11

updated JSDocs and general code clean up.

a366170

abose merged commit 16c4483 into adobe:master Apr 7, 2015

abose added a commit that referenced this pull request Apr 7, 2015

Merge Code Folding pull request 10792

d6262f1

Merge pull request #10792 Code Folding by Patrick Oladimeji; Github:@thehogfather

peterflynn reviewed Apr 8, 2015
View reviewed changes

core-ai-bot mentioned this pull request Aug 30, 2021

[CLOSED] integration of code-folding extension into brackets brackets-archive/bracketsIssues#9494

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

integration of code-folding extension into brackets #10792

integration of code-folding extension into brackets #10792

thehogfather commented Mar 25, 2015

Florian-R commented Mar 25, 2015

prksingh commented Mar 25, 2015

abose commented Mar 25, 2015

Florian-R commented Mar 25, 2015

thehogfather commented Mar 25, 2015

ryanstewart commented Mar 25, 2015

ryanstewart commented Mar 26, 2015

MiguelCastillo Mar 27, 2015

MiguelCastillo commented Mar 27, 2015

thehogfather commented Mar 27, 2015

marcelgerber commented Mar 29, 2015

thehogfather commented Mar 29, 2015

nethip commented Mar 30, 2015

abose commented Mar 30, 2015

thehogfather commented Apr 6, 2015

abose commented Apr 7, 2015

MiguelCastillo commented Apr 7, 2015

le717 commented Apr 7, 2015

thehogfather commented Apr 7, 2015

peterflynn Apr 8, 2015

abose commented Apr 8, 2015

abose commented Apr 8, 2015

thehogfather commented Apr 8, 2015

abose commented Apr 9, 2015

peterflynn commented Apr 9, 2015

abose commented Apr 9, 2015

redmunds commented Apr 9, 2015

pooria-h commented May 28, 2015

le717 commented May 28, 2015

ryanstewart commented May 28, 2015

pooria-h commented May 28, 2015

integration of code-folding extension into brackets #10792

integration of code-folding extension into brackets #10792

Conversation

thehogfather commented Mar 25, 2015

Florian-R commented Mar 25, 2015

prksingh commented Mar 25, 2015

abose commented Mar 25, 2015

Florian-R commented Mar 25, 2015

thehogfather commented Mar 25, 2015

ryanstewart commented Mar 25, 2015

ryanstewart commented Mar 26, 2015

MiguelCastillo Mar 27, 2015

Choose a reason for hiding this comment

MiguelCastillo commented Mar 27, 2015

thehogfather commented Mar 27, 2015

marcelgerber commented Mar 29, 2015

thehogfather commented Mar 29, 2015

nethip commented Mar 30, 2015

abose commented Mar 30, 2015

thehogfather commented Apr 6, 2015

abose commented Apr 7, 2015

MiguelCastillo commented Apr 7, 2015

le717 commented Apr 7, 2015

thehogfather commented Apr 7, 2015

peterflynn Apr 8, 2015

Choose a reason for hiding this comment

abose commented Apr 8, 2015

abose commented Apr 8, 2015

thehogfather commented Apr 8, 2015

abose commented Apr 9, 2015

peterflynn commented Apr 9, 2015

abose commented Apr 9, 2015

redmunds commented Apr 9, 2015

pooria-h commented May 28, 2015

le717 commented May 28, 2015

ryanstewart commented May 28, 2015

pooria-h commented May 28, 2015