buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject svn commit: r1417248 - in /buildr/trunk: CHANGELOG lib/buildr/ide/idea.rb
Date Wed, 05 Dec 2012 00:28:02 GMT
Author: donaldp
Date: Wed Dec  5 00:28:02 2012
New Revision: 1417248

URL: http://svn.apache.org/viewvc?rev=1417248&view=rev
Log:
In the IntelliJ extension, defer the materialization of the default_components until expansion
time to avoid loss of sub-components added after an add_component call.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/ide/idea.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1417248&r1=1417247&r2=1417248&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Dec  5 00:28:02 2012
@@ -1,4 +1,7 @@
 1.4.10 (Pending)
+* Fixed: In the IntelliJ extension, defer the materialization of the
+         default_components until expansion time to avoid loss of sub-
+         components added after an add_component call.
 * Fixed: BUILDR-633 - Remove hardcoded shebang lines in all-in-one release.
 * Added: Create a simple extension that modifies the project layout to place
          generated files at the top level.

Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1417248&r1=1417247&r2=1417248&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Wed Dec  5 00:28:02 2012
@@ -97,7 +97,7 @@ module Buildr
       end
 
       def components
-        @components ||= self.default_components.compact
+        @components ||= []
       end
 
       def create_composite_component(name, components)
@@ -135,7 +135,7 @@ module Buildr
             inject_component(doc, element)
           end
         end
-        inject_components(doc, self.components)
+        inject_components(doc, self.default_components.compact + self.components)
         doc
       end
 



Mime
View raw message