Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Conversation

@abose
Copy link
Contributor

@abose abose commented Apr 13, 2015

Do not merge yet - we should land PR #10859(Code folding UI & code style tweaks) first.

Fixes Unit test failures after code folding integration and issues #10857 , #10856

point 6 in issue #10857 is still fix in progress.

abose added 2 commits April 13, 2015 14:41
The stray fold triangles on delete
and exeptionthrowing issues.
@abose
Copy link
Contributor Author

abose commented Apr 13, 2015

The only change is in /foldhelpers/foldgutter.js, All other changes are part of PR #10859

@thehogfather @peterflynn please review this change.

@thehogfather
Copy link
Contributor

This looks a good fix for the phantom fold marks issue.

@abose
Copy link
Contributor Author

abose commented Apr 13, 2015

@peterflynn waiting for PR #10859 to be merged.

@peterflynn
Copy link
Member

@abose I think there might be something funny with the git history in this PR -- if I view a comparison against my branch, it appears to also contain a bunch of ALF changes. Please check to make sure the history is in an ok state before anyone merges this.

Also, in the future please use abose/ as a prefix on your branch names -- since all committers are pushing branches to this repo, having informal "namespaces" is important to help keep branches organized.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I understand this part of the change. The only time changeObj.from.line + lineChanges < 0 could happen is when a bunch of lines were deleted at the start of the file. Do we actually want to skip running updateFoldInfo() in that case?

I'm wondering if what we really want is something more like Math.max(0, changeObj.from.line + lineChanges) on the line below this instead... and similar for the 2nd arg too.

@abose
Copy link
Contributor Author

abose commented Apr 14, 2015

changed, Math.max(0, changeObj.from.line + lineChanges) and calling updateFoldInfo() sounds more logical.

Also missed to add abose prefix with this branch name, will do.

@abose
Copy link
Contributor Author

abose commented Apr 14, 2015

point 6 in issue #10857 is Also fixed with the change.

abose added a commit that referenced this pull request Apr 15, 2015
@abose abose merged commit 86abef1 into master Apr 15, 2015
@abose
Copy link
Contributor Author

abose commented Apr 15, 2015

Thanks @thehogfather for verifying.
Merging the fix.

@abose abose deleted the CodeFoldingFixes branch April 15, 2015 05:32
@peterflynn
Copy link
Member

Ah, ok so @thehogfather got a chance to look at the additional changes here that occurred after my review? There's a whole bunch of new code here that was added (syncDocToFoldsCache() and a bunch of other changes in commits 45c7a99, d69ade3, & 684a507)... Normally that would require a re-review by someone before merging.

@thehogfather
Copy link
Contributor

I'll get some more time to test and review more rigorously this evening and update the thread.

@abose
Copy link
Contributor Author

abose commented Apr 15, 2015

@thehogfather Could you help with fixing some of these issues now that we are nearing the release date (probably next week), It would help very much if you could!

@thehogfather
Copy link
Contributor

Yes I can. I'll have a look this evening.

@abose
Copy link
Contributor Author

abose commented Apr 15, 2015

Thanks :)

thehogfather added a commit to thehogfather/brackets that referenced this pull request Apr 16, 2015
thehogfather added a commit to thehogfather/brackets that referenced this pull request Apr 17, 2015
* commit '94b72f96730e27103283cce160bd25471b998eb2': (29 commits)
  Updated by ALF automation.
  Updating release version to Release 1.4
  Fix QuickOpen unit tests after introduction of QuickSearchField - listens for Enter on keydown, not keyup; expects an "input" event to follow every text change (Enter key processing now waits until text change events have caught up so Enter key never takes effect if change event never comes)
  Revert "Getting Started project: remove useless whitespace, fix an arrow"
  Store code-folding view state in project-specific buckets for cleaner organization. If we later offer a way for users to delete stored data for a project, this ensures code folding data will be cleaned up along with everything else. (This is also how we store Quick Edit expand/collapse state, which is very similar).
  More Health Data UX tweaks, after code review: - Clarify that preview of data it NOT getting sent if user opted out - Simplify wording of opt in/out checkbox - Dialogs.addLinkTooltips(): don't touch links that already have a tooltip - Minor code style tweaks
  various fixes for line folds syncing when modifying documents cc adobe#10888 adobe#10857
  Renaming confuding createIfNew flag to createIfMissing.
  Fix duplicated code for adding tooltips to links
  Rename ExtensionManager flag for clarity Use ExtensionManager constant instead of duplicating string literal
  Don't sent Health Data 30 until minutes after showing the popup, regardless of how quickly the user closes it - this gives users time to read more and opt out if desired, even if they close the popup before changing the pref.
  - Tighten wording in Health Data notification popup - Add similar wording for context to Health Data preferences/preview dialog - Show full preferences dialog when Help menu item is invoked, even if user is currently opted out (it's actually impossible to opt back in if we showed the popup instead) - Improve layout & popup transition in/out - Add tooltips to links in popup & dialog - Fix bug with popup placement on Linux (HTML menu bar) - Remove unused HealthDataNotification.showDialogHealthDataNotification() and change unit test to check notification popup instead
  Styling tweaks.
  Fixing JSHint issues that are causing the travis build to fail,
  Update healthdata-notification-dialog.html
  Changing some UI for the first time health data popup
  Making some CSS changes and adding close button to the popup
  Adding a new popup for the first healthDataNotification
  Added the functionality only for state.json file and also the message when the file is moved to trash.
  Fix for adobe#10715 Untitled documents aren't added to MRU until visited a 2nd time
  ...
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.

4 participants