|
From: Christopher W. <caw...@us...> - 2006-02-18 16:53:55
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28822 Modified Files: plugin.xml Log Message: overhaul our completion proposal/template code. Now we will apply formatting to templates when inserted! Plus we're closer to the way JDT does things. We still can't use the actual code formatter on the templates (because our old one does a massive replace edit which messes up variables like the cursor placement). The end result is that users should create templates with somewhat proper formatting initially. Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/plugin.xml,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** plugin.xml 10 Feb 2006 20:17:20 -0000 1.72 --- plugin.xml 18 Feb 2006 16:53:51 -0000 1.73 *************** *** 37,41 **** name="%PreferencePage.rdtTemplatePreferences" category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.ui.rubyeditor.templates.RubyTemplatePreferencePage" id="org.rubypeople.rdt.ui.TemplatesPreferencePage"> </page> --- 37,41 ---- name="%PreferencePage.rdtTemplatePreferences" category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.ui.preferences.RubyTemplatePreferencePage" id="org.rubypeople.rdt.ui.TemplatesPreferencePage"> </page> *************** *** 221,224 **** --- 221,231 ---- sequence="M1+SPACE"> </key> + <key + commandId="org.rubypeople.rdt.ui.edit.text.ruby.content.assist.proposals" + contextId="org.rubypeople.rdt.ui.rubyEditorScope" + schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" + sequence="CTRL+SPACE" + platform="carbon"> + </key> </extension> <extension point="org.eclipse.ui.commands"> *************** *** 462,488 **** </filter> </extension> <extension point="org.eclipse.ui.editors.templates"> <contextType name="%rubyFile.contextType.name" ! class="org.rubypeople.rdt.internal.ui.rubyeditor.templates.RubyFileContextType" ! id="org.rubypeople.rdt.ui.templateContextType.rubyFile"> </contextType> - <resolver - name="%rdt.resolvers.src" - type="src" - icon="templates/resolver.gif" - description="%rdt.resolvers.src.description" - contextTypeId="org.rubypeople.rdt.ui.templateContextType.XML" - class="org.rubypeople.rdt.internal.ui.rubyeditor.templates.RubyVariableResolver"> - </resolver> - <resolver - name="%rdt.resolvers.dst" - type="dst" - icon="templates/resolver.gif" - description="%rdt.resolvers.dst.description" - contextTypeId="org.rubypeople.rdt.ui.templateContextType.XML" - class="org.rubypeople.rdt.internal.ui.rubyeditor.templates.RubyVariableResolver"> - </resolver> <include file="templates/rdt.xml" --- 469,482 ---- </filter> </extension> + <!-- =========================================================================== --> + <!-- Templates --> + <!-- =========================================================================== --> <extension point="org.eclipse.ui.editors.templates"> <contextType name="%rubyFile.contextType.name" ! class="org.rubypeople.rdt.internal.corext.template.ruby.RubyContextType" ! id="ruby"> </contextType> <include file="templates/rdt.xml" |