* revert to clear 0.9 version
diff --git a/plugins/org.eclipse.dltk.ruby.ui/.classpath b/plugins/org.eclipse.dltk.ruby.ui/.classpath
index ce73933..751c8f2 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/.classpath
+++ b/plugins/org.eclipse.dltk.ruby.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
index b8fbad8..161f625 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.ruby.ui/META-INF/MANIFEST.MF
@@ -6,21 +6,23 @@
Bundle-Activator: org.eclipse.dltk.ruby.internal.ui.RubyUI
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.ui,
+Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.ui.editors,
- org.eclipse.jface.text,
- org.eclipse.search,
- org.eclipse.ui.ide,
- org.eclipse.ui.console,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.debug.core,
org.eclipse.dltk.ui,
org.eclipse.dltk.core,
org.eclipse.dltk.ruby.core,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources,
org.eclipse.dltk.launching,
- org.eclipse.dltk.debug
+ org.eclipse.dltk.debug,
+ org.eclipse.dltk.debug.ui,
+ org.eclipse.dltk.ruby.debug.ui,
+ org.eclipse.search,
+ org.eclipse.debug.core,
+ org.eclipse.ui.console
Eclipse-LazyStart: true
Export-Package: org.eclipse.dltk.ruby.internal.ui,
org.eclipse.dltk.ruby.internal.ui.editor,
diff --git a/plugins/org.eclipse.dltk.ruby.ui/plugin.properties b/plugins/org.eclipse.dltk.ruby.ui/plugin.properties
index 6b07c94..43fc8f9 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/plugin.properties
+++ b/plugins/org.eclipse.dltk.ruby.ui/plugin.properties
@@ -61,7 +61,7 @@
RubyEditor.name = Ruby Source Editor
# Templates
-RubyTemplateContext.name = ruby
+RubyTemplateContext.name = Ruby templates
# Property pages
RubyBuildPathPropertyPage.name = Ruby Build Path
@@ -70,7 +70,7 @@
RubyPreferencePage.name = Ruby
RubyEditorPreferencePage.name = Editor
RubyEditorSyntaxColoringPreferencePage.name = Syntax Coloring
-RubyCodeTemplatesPreferencePage.name = Templates
+RubyCodeTemplatesPreferencePage.name = Code Templates
# Decorators
RubyProjectDecorator.name = Ruby Project Decorator
diff --git a/plugins/org.eclipse.dltk.ruby.ui/plugin.xml b/plugins/org.eclipse.dltk.ruby.ui/plugin.xml
index 0633af3..fdc525e 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/plugin.xml
+++ b/plugins/org.eclipse.dltk.ruby.ui/plugin.xml
@@ -144,8 +144,8 @@
id="org.eclipse.dltk.ruby.preferences.editor.syntaxcoloring"
name="%RubyEditorSyntaxColoringPreferencePage.name"/>
<page
- category="org.eclipse.dltk.ruby.preferences.editor"
- class="org.eclipse.dltk.ruby.internal.ui.templates.RubyCodeTemplatesPreferencePage"
+ category="org.eclipse.dltk.ruby.preferences"
+ class="org.eclipse.dltk.ruby.internal.ui.templates.RubyTemplatePreferencePage"
id="org.eclipse.dltk.ruby.preferences.templates"
name="%RubyCodeTemplatesPreferencePage.name">
</page>
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyProjectDecorator.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyProjectDecorator.java
index 52b31b8..13ac544 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyProjectDecorator.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/RubyProjectDecorator.java
@@ -4,7 +4,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.ruby.core.RubyNature;
-import org.eclipse.dltk.ui.DLTKUIPlugin;
import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.jface.viewers.ILightweightLabelDecorator;
import org.eclipse.jface.viewers.LabelProvider;
@@ -20,13 +19,14 @@
project = (IProject) element;
}
- if (project != null && project.isOpen()) {
+ if (project != null) {
try {
if (project.hasNature(RubyNature.NATURE_ID)) {
decoration.addOverlay(RubyImages.PROJECT_DECARATOR);
}
} catch (CoreException e) {
- DLTKUIPlugin.log(e);
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
}
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/documentation/RubyDocumentationProvider.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/documentation/RubyDocumentationProvider.java
index 9200d96..4fe2f53 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/documentation/RubyDocumentationProvider.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/documentation/RubyDocumentationProvider.java
@@ -185,7 +185,7 @@
+ method.getElementName();
RiHelper helper = RiHelper.getInstance();
String doc = helper.getDocFor(keyword);
- if (doc != null && (doc.indexOf("Nothing known about") != -1)
+ if ((doc.indexOf("Nothing known about") != -1)
|| doc.trim().length() == 0) {
// XXX megafix: some Kernel methods are documented in Object
if (pp.getElementName().equals("Kernel")) {
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
index 951a96c..6cc6bfc 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/editor/RubyEditor.java
@@ -55,7 +55,7 @@
protected void initializeEditor() {
super.initializeEditor();
setEditorContextMenuId(EDITOR_CONTEXT);
- setRulerContextMenuId(RULER_CONTEXT);
+ setRulerContextMenuId(RULER_CONTEXT);
}
protected IPreferenceStore getScriptPreferenceStore() {
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java
deleted file mode 100644
index 60bd1c8..0000000
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyCodeTemplatesPreferencePage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
-
- *******************************************************************************/
-package org.eclipse.dltk.ruby.internal.ui.templates;
-
-import org.eclipse.dltk.ruby.internal.ui.RubyUI;
-import org.eclipse.dltk.ruby.internal.ui.preferences.SimpleRubySourceViewerConfiguration;
-import org.eclipse.dltk.ruby.internal.ui.text.RubyPartitions;
-import org.eclipse.dltk.ruby.internal.ui.text.RubyTextTools;
-import org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage;
-import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class RubyCodeTemplatesPreferencePage extends
- ScriptTemplatePreferencePage implements IWorkbenchPreferencePage {
-
- protected class RubyEditTemplateDialog extends EditTemplateDialog {
- public RubyEditTemplateDialog(Shell parent, Template template,
- boolean edit, boolean isNameModifiable,
- ContextTypeRegistry registry) {
- super(parent, template, edit, isNameModifiable, registry);
- }
-
- protected SourceViewer createViewer(Composite parent) {
- return RubyCodeTemplatesPreferencePage.this.createViewer(parent);
- }
- }
-
- public RubyCodeTemplatesPreferencePage() {
- setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
-
- setTemplateStore(RubyTemplateAccess.getInstance().getTemplateStore());
- setContextTypeRegistry(RubyTemplateAccess.getInstance()
- .getContextTypeRegistry());
- }
-
- protected ScriptSourceViewerConfiguration createSourceViewerConfiguration(
- IDocument document) {
- IPreferenceStore store = RubyUI.getDefault().getPreferenceStore();
-
- RubyTextTools textTools = RubyUI.getDefault().getTextTools();
- textTools.setupDocumentPartitioner(document,
- RubyPartitions.RUBY_PARTITIONING);
-
- return new SimpleRubySourceViewerConfiguration(textTools
- .getColorManager(), store, null,
- RubyPartitions.RUBY_PARTITIONING, false);
- }
-
- /*protected Template editTemplate(Template template, boolean edit,
- boolean isNameModifiable) {
- EditTemplateDialog dialog = new RubyEditTemplateDialog(getShell(),
- template, edit, isNameModifiable, getContextTypeRegistry());
- if (dialog.open() == Window.OK) {
- return dialog.getTemplate();
- }
- return null;
- }*/
-}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplatePreferencePage.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplatePreferencePage.java
new file mode 100644
index 0000000..8b2682a
--- /dev/null
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/templates/RubyTemplatePreferencePage.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+
+ *******************************************************************************/
+package org.eclipse.dltk.ruby.internal.ui.templates;
+
+import org.eclipse.dltk.ruby.internal.ui.RubyUI;
+import org.eclipse.dltk.ruby.internal.ui.preferences.SimpleRubySourceViewerConfiguration;
+import org.eclipse.dltk.ruby.internal.ui.text.RubyPartitions;
+import org.eclipse.dltk.ruby.internal.ui.text.RubyTextTools;
+import org.eclipse.dltk.ui.templates.ScriptTemplatePreferencePage;
+import org.eclipse.dltk.ui.text.ScriptSourceViewerConfiguration;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class RubyTemplatePreferencePage extends ScriptTemplatePreferencePage
+ implements IWorkbenchPreferencePage {
+ public RubyTemplatePreferencePage() {
+ setPreferenceStore(RubyUI.getDefault().getPreferenceStore());
+
+ setTemplateStore(RubyTemplateAccess.getInstance().getTemplateStore());
+ setContextTypeRegistry(RubyTemplateAccess.getInstance()
+ .getContextTypeRegistry());
+ }
+
+ protected ScriptSourceViewerConfiguration createSourceViewerConfiguration(
+ IDocument document) {
+ IPreferenceStore store = RubyUI.getDefault().getPreferenceStore();
+
+ RubyTextTools textTools = RubyUI.getDefault().getTextTools();
+ textTools.setupDocumentPartitioner(document,
+ RubyPartitions.RUBY_PARTITIONING);
+
+ return new SimpleRubySourceViewerConfiguration(textTools
+ .getColorManager(), store, null,
+ RubyPartitions.RUBY_PARTITIONING, false);
+
+ }
+}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
index 041629d..4caa8ac 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/text/RubySourceViewerConfiguration.java
@@ -251,22 +251,32 @@
}
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+
if (getEditor() != null) {
+
ContentAssistant assistant = new ContentAssistant();
-
- assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
- assistant.setRestoreCompletionProposalSize(getSettings("completion_proposal_size")); //$NON-NLS-1$
- assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
- assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
- //assistant.setStatusLineVisible(true);
- //assistant.setStatusMessage("Hello!");
-
+ assistant
+ .setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
+
+ assistant
+ .setRestoreCompletionProposalSize(getSettings("completion_proposal_size")); //$NON-NLS-1$
+
IContentAssistProcessor scriptProcessor = new RubyCompletionProcessor(
getEditor(), assistant, IDocument.DEFAULT_CONTENT_TYPE);
- assistant.setContentAssistProcessor(scriptProcessor, IDocument.DEFAULT_CONTENT_TYPE);
-
- RubyContentAssistPreference.getDefault().configure(assistant, fPreferenceStore);
-
+ assistant.setContentAssistProcessor(scriptProcessor,
+ IDocument.DEFAULT_CONTENT_TYPE);
+
+
+ RubyContentAssistPreference.getDefault().configure(assistant,
+ fPreferenceStore);
+
+ assistant
+ .setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
+ assistant
+ .setInformationControlCreator(getInformationControlCreator(sourceViewer));
+
+ // assistant.setStatusLineVisible(true);
+
return assistant;
}
@@ -278,11 +288,10 @@
return new IInformationControlCreator() {
public IInformationControl createInformationControl(Shell parent) {
return new DefaultInformationControl(parent, SWT.NONE,
- new HTMLTextPresenter(true), "");
+ new HTMLTextPresenter(true), "My Status");
}
};
}
-
protected void initializeQuickOutlineContexts(InformationPresenter presenter,
IInformationProvider provider) {
presenter.setInformationProvider(provider, RubyPartitions.RUBY_COMMENT);
diff --git a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewProjectWizard.java b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewProjectWizard.java
index 29f150b..8f9cc23 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewProjectWizard.java
+++ b/plugins/org.eclipse.dltk.ruby.ui/src/org/eclipse/dltk/ruby/internal/ui/wizards/RubyNewProjectWizard.java
@@ -17,8 +17,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IModelElement;
+import org.eclipse.dltk.debug.ui.DLTKDebugUIPlugin;
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.ruby.core.RubyNature;
+import org.eclipse.dltk.ruby.internal.debug.ui.interpreters.RubyInterpreterPreferencePage;
import org.eclipse.dltk.ruby.internal.ui.RubyImages;
import org.eclipse.dltk.ruby.internal.ui.RubyUI;
import org.eclipse.dltk.ruby.internal.ui.preferences.RubyBuildPathsBlock;
@@ -33,13 +35,11 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-public class RubyNewProjectWizard extends NewElementWizard implements
- INewWizard, IExecutableExtension {
+public class RubyNewProjectWizard extends NewElementWizard implements INewWizard, IExecutableExtension {
public static final String WIZARD_ID = "org.eclipse.dltk.ruby.wizards.newproject";
-
+
private ProjectWizardFirstPage fFirstPage;
private ProjectWizardSecondPage fSecondPage;
private IConfigurationElement fConfigElement;
@@ -55,23 +55,24 @@
fFirstPage = new ProjectWizardFirstPage() {
RubyInterpreterGroup fInterpreterGroup;
-
- final class RubyInterpreterGroup extends AbstractInterpreterGroup {
-
- public RubyInterpreterGroup(Composite composite) {
- super(composite);
- }
+
+ final class RubyInterpreterGroup extends AbstractInterpreterGroup {
+
+ public RubyInterpreterGroup(Composite composite) {
+ super (composite);
+ }
protected String getCurrentLanguageNature() {
return RubyNature.NATURE_ID;
}
-
-
- protected String getIntereprtersPreferencePageId() {
- return "org.eclipse.dltk.ruby.preferences.interpreters";
- }
- };
+ protected void showInterpreterPreferencePage() {
+ IPreferencePage page = new RubyInterpreterPreferencePage();
+ DLTKDebugUIPlugin.showPreferencePage("org.eclipse.dltk.ruby.debug.ui.interpreters.RubyInterpreterPreferencePage", page);
+ }
+
+ };
+
protected void createInterpreterGroup(Composite parent) {
fInterpreterGroup = new RubyInterpreterGroup(parent);
}
@@ -96,20 +97,16 @@
return true;
}
};
-
+
// First page
fFirstPage.setTitle(RubyWizardMessages.NewProjectFirstPage_title);
- fFirstPage
- .setDescription(RubyWizardMessages.NewProjectFirstPage_description);
+ fFirstPage.setDescription(RubyWizardMessages.NewProjectFirstPage_description);
addPage(fFirstPage);
// Second page
fSecondPage = new ProjectWizardSecondPage(fFirstPage) {
- protected BuildpathsBlock createBuildpathBlock(
- IStatusChangeListener listener) {
- return new RubyBuildPathsBlock(
- new BusyIndicatorRunnableContext(), listener, 0,
- useNewSourcePage(), null);
+ protected BuildpathsBlock createBuildpathBlock(IStatusChangeListener listener) {
+ return new RubyBuildPathsBlock(new BusyIndicatorRunnableContext(), listener, 0, useNewSourcePage(), null);
}
protected String getScriptNature() {
@@ -123,8 +120,7 @@
addPage(fSecondPage);
}
- protected void finishPage(IProgressMonitor monitor)
- throws InterruptedException, CoreException {
+ protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fSecondPage.performFinish(monitor); // use the full progress monitor
}
@@ -136,13 +132,12 @@
}
return res;
}
-
+
/*
* Stores the configuration element for the wizard. The config element will
* be used in <code>performFinish</code> to set the result perspective.
*/
- public void setInitializationData(IConfigurationElement cfig,
- String propertyName, Object data) {
+ public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
fConfigElement = cfig;
}
diff --git a/plugins/org.eclipse.dltk.ruby.ui/templates/templates.xml b/plugins/org.eclipse.dltk.ruby.ui/templates/templates.xml
index 2ebcab3..8f07578 100644
--- a/plugins/org.eclipse.dltk.ruby.ui/templates/templates.xml
+++ b/plugins/org.eclipse.dltk.ruby.ui/templates/templates.xml
@@ -83,7 +83,7 @@
context="rubyUniversalTemplateContextType"
description="%ifTemplate2.description"
id="org.eclipse.dltk.ruby.ui.templates.if2"
- name="if">if __FILE__ == $$0
+ name="if">if __FILE__ == $0
${cursor}
end</template>
@@ -130,7 +130,7 @@
id="org.eclipse.dltk.ruby.ui.templates.begin1"
name="begin">begin
${body}
-end until ${condition}</template>
+end until {$condition}</template>
<template
context="rubyUniversalTemplateContextType"
@@ -138,7 +138,7 @@
id="org.eclipse.dltk.ruby.ui.templates.begin2"
name="begin">begin
${body}
-end while ${condition}</template>
+end while {$condition}</template>
<template
context="rubyUniversalTemplateContextType"
