1408810 - Fix Eclipse project generation so that it sets up the formatter preferences again

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Jonathan Watt [:jwatt]]

In bug 1060210, BenWa added some code to run eclipse to automate the step of importing the generated project into the generated workspace. As part of that he added a _write_noindex method to set a preference in 'org.eclipse.cdt.core.prefs' to disable the indexer (which takes a long time to run) while the import is running, and a method _remove_noindex to remove that preference file to re-enable the indexer once the import is done.

Unfortunately the 'org.eclipse.cdt.core.prefs' file that _write_noindex overwrites and that _remove_noindex removes is the prefs file that the FORMATTER_SETTINGS were previously written to in consume_finished before consume_finished call _import_project(). In other words this change made us overwrite the formatter settings, which is why projects don't have that set up any more.

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 2

[Jonathan Watt [:jwatt]]

Make sure you use Splinter Review to get the extended comment that explains what's going on here.

Comment 3

[Botond Ballo [:botond]]

Comment on attachment 8918703 [details] [diff] [review]
patch

Review of attachment 8918703 [details] [diff] [review]:
-----------------------------------------------------------------

::: python/mozbuild/mozbuild/backend/cpp_eclipse.py
@@ +113,5 @@
>  
>          self._write_launch_files(launch_dir)
>  
> +        cdt_ui_prefs_path = os.path.join(workspace_settings_dir, 'org.eclipse.cdt.ui.prefs')
> +        cdt_ui_prefs = STATIC_CDT_UI_PREFS

Maybe factor out the computation of cdt_ui_prefs into a function, to keep consume_finished() relatively short and more readable?

Comment 4

[Jonathan Watt [:jwatt]]

(In reply to Botond Ballo [:botond] from comment #3)
> Maybe factor out the computation of cdt_ui_prefs into a function, to keep
> consume_finished() relatively short and more readable?

I'll pass on that for the moment since I want to think about how to structure this file a bit more, but don't have the time to do that right now.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/e32acd53fd26
Get the Eclipse CDT code formatter working again. r=botond

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/e32acd53fd26