bomsy / brackets-compare Goto Github PK

Add save feature to merge addon.

After editing all differences in the compare mode, it does not save those differences, both files remains the same, I already tried in different positions or changing the folder in which I am working on it.

Is that a bug? Or this extensions just show differences and does nothing to correct them?
In the last case, why you can press in the arrows to fix the differences that you want if later does not save the changes?

Release 1.8 build 1.8.0-17108
OSX 10.11.6

I tried the addon today and its really nice, ive updated the theme so it has dark color and fits in to my main theme now.

In the middle gab there is this icon "revert chunk", in the compare panels its adjsuted but in the actual file nothing is changed. Is this normal?

Hello!

Console deprecated warning: Use brackets.getModule("thirdparty/CodeMirror/lib/codemirror") instead of global CodeMirror.

Use brackets.getModule("thirdparty/CodeMirror/lib/codemirror") instead of global CodeMirror.
    at Object.defineProperty.get (/brackets.js:111:32)
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:8:13
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:770:3
/utils/DeprecationWarning.js:88 Use brackets.getModule("thirdparty/CodeMirror/lib/codemirror") instead of global CodeMirror.
    at Object.defineProperty.get (/brackets.js:111:32)
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:434:19
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:770:3
/utils/DeprecationWarning.js:88 Use brackets.getModule("thirdparty/CodeMirror/lib/codemirror") instead of global CodeMirror.
    at Object.defineProperty.get (/brackets.js:111:32)
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:764:3
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:770:3
/utils/DeprecationWarning.js:88 Use brackets.getModule("thirdparty/CodeMirror/lib/codemirror") instead of global CodeMirror.
    at Object.defineProperty.get (/brackets.js:111:32)
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:767:3
    at file:///C:/Users/anephew/AppData/Roaming/Brackets/extensions/user/brackets-compare/libs/merge.js:770:3

Please fix warning, define CodeMirror = brackets.getModule("thirdparty/CodeMirror/lib/codemirror") in your file.

I installed latest version of brackets but while installing this extention I am getting following error.

While comparing two files, the diff panels don't use any of the UI customizations (tabs vs spaces, word wrap, themes).

When i drag the zip file into brakcets or enter the url..it doesn't install right and i get an error

Problem with displaying... Scrollbars in content . see attached screenshot
after restarting brackets it works the first time. 2nd fails like shown.

So Its not on your plugin itself..but ;your plugin broke eqftp..to where the settings pop up wouldn't show up...was still hidden. Once removing your plugin, it works again. Just wanted to share

Unit tests are needed,

Hi @bomsy!

Thanks for this extension :) I have some improvement ideas:

1. At the moment the first file must be in the current project file so it isn't possible to add a file with drag & drop to the working files and compare them because the context option 'Compare with file..' isn't available.
2. When the user choose the compare with file option a open file dialog appears and I need to choose the same directory to open the second file :/ An idea would be to check whether the user is a split mode and then the user can choose to compare these two files via the View menu.

What do you think about it?

If I copy&paste code from one view to the other, I cannot save these changes to the file.

Tested:

• ctrl + s
• file -> Save
• file -> Save all

Off topic: I love this extension. Thank you!

It would be great to have the ability to ignore whitespace, in some cases this is usefull as I had two files that were very similiar with a few differences I needed to discover but they were slightly tabbed differently so all lines were red due to tabbing only.

The extension is installed, but no diff button available? Maybe I'm doing something wrong?
Thanks!

Look screen please https://www.dropbox.com/s/caw9y1j8o7ycm9a/%D0%A1%D0%BA%D1%80%D0%B8%D0%BD%D1%88%D0%BE%D1%82%202014-07-22%2023.51.04.png

This should be obvious by looking at your own screenshots for this extension.
The first has a black background, the second has a light grey background with light yellow comparison.
Switching to comparison view basically makes me go blind for a while. hiss

Could it use the editor's theme?

When in split mode (either one) and trying to compare files, nothing is happening. When I looked into console:

Uncaught TypeError: Cannot read property '1' of nullgetExtension @ main.js:75(anonymous function) @ main.js:111dispatch @ thirdparty.min.js:20r.handle @ thirdparty.min.js:20

So the problem seems to be with regex not allowing files without extension and to be honest quite often tmp files wont have extension. Would be great to fix that, thanks!

Compare with... a file in the working directory, must be much more easy. Why not let us choose Compare with an opened file... and Compare with another file.... Only last option will open OS file manager. First will let us choose in our opened files.

I hope it's clear. :)

When I use the Brackets Compare extension it closes the sidebar. I cannot enable the sidebar again until I remove the Brackets Compare extension from Brackets.

Extension seems to be very CPU-heavy.. However I understand it could be me using it incorrectly, meaning too large files. Is there a recommended number of lines that the files shouldn't exceed?

I have not had a lot of time to maintain this project and it seems like it has a couple of users that find it useful.
Would anyone be interested in maintaining the project?

This extension doesn't work at all with the latest Brackets. The context menu does not even show the option to compare.

that

Add line markers to show where content was removed, or where content will be added

Add support for the use of the brackets themes to the merge_addon for Codemirror.

We should be able to auto update diff markers as view content are changed.

BBEdit "diff" mode is very efficient, here are the tremendously useful features that I miss when I use brackets-compare:

1. bbdiff, a CLI which takes two filenames as arguments and opens the editor in doff mode between the two files
2. compare mode opens 3 windows:

TEXT1 | TEXT2
    diff

in the diff window, you get a list of chunks with line numbers, and you can go quickly through the list with the keyboard or mouse, updating the TEXT1 and TEXT2 windows ; then with a click you can apply changes from TEXT1 to TEXT2 or the other way.
3. you can select two filenames in the list/project pane and select a contextual "compare selected documents" menu
4. (There's a directory diff mode also, but I personally prefer to directly use diff -r)

Can you put in a screenshot of the extension in action in the GitHub project main wiki?

I would like to contribute...can you give me a summary of why it doesn't work with new brackets and maybe I can help some?

I'm a french speaking user and don't see any translation. I could translate if needed.

I'm using Brackets 1.1. on a MAC OS El Capitan 10.11.6.
Brackets Compare will not allow me to

• change which files I am comparing

• close or open new files to compare

• or unclick the compare action

Cannot save changes made in diff view. This issue has been closed in 2015, but still exixts even in 2017. Why was it closed?

Hello, this extension is exactly, what I need, but I have two ideas, how to make your extension better:

• In all modern browsers, where compare interface is natively present, it works this way:
  1. open 1st file
  2. open 2nd file and let it active/openned
  3. right click to 1st file and select "compare"
  4. the editor compares currently openned file with the one you clicked on

It would be great to change the behavior of your extension to behave this way. I think it is all ways better than select file dialog. Brackets API contains variable for currently openned file, so no problem there.

• Accorfing to me it should let the files/project menu openned and automatically close compared view after selecting another file to view. Just saying

Add markers for diff words to increase specificity.

I'm using Brackets r 1.2 build 1.2.0-15697 and the compare plugin doesn't seem to be working. I can load two files but no differences are marked or anything. It's just like I'm opening them in split view.

Is there a compatibility problem or something else going on?

There's not any highlights and comments concerning the difference between two HTML files.

Is this some kind of bug or just that I use it the wrong way?

Hello, after I close compare interface (with blue x on the right), I am not able to change project (project folder) I'm currently working in and the file menu looks broken.