MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-5044: Sample code fragments in the editor settings either refer to IDEA, or contain typos.

Browse Source
This commit is contained in:
Oleg Shpynov
2009-09-22 19:32:26 +04:00
parent f4e0df9cc3
commit bbcfd34959
3 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
+2 -36
View File
@@ -2,10 +2,10 @@ package com.intellij.openapi.diff.impl.settings;
import com.intellij.application.options.colors.ColorAndFontSettingsListener;
import com.intellij.application.options.colors.PreviewPanel;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.diff.DiffContent;
import com.intellij.openapi.diff.DiffRequest;
import com.intellij.openapi.diff.SimpleContent;
import com.intellij.openapi.diff.impl.incrementalMerge.Change;
import com.intellij.openapi.diff.impl.incrementalMerge.MergeList;
import com.intellij.openapi.diff.impl.incrementalMerge.MergeSearchHelper;
@@ -15,11 +15,8 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.Disposable;
import com.intellij.util.EventDispatcher;
import org.jetbrains.annotations.NonNls;
import javax.swing.*;
import java.awt.*;
@@ -109,11 +106,7 @@ public class DiffPreviewPanel implements PreviewPanel {
}
public DiffContent[] getContents() {
return new DiffContent[]{createContent(LEFT_TEXT), createContent(CENTER_TEXT), createContent(RIGHT_TEXT)};
}
private static SimpleContent createContent(String text) {
return new SimpleContent(text, StdFileTypes.JAVA);
return DiffPreviewProvider.getContents();
}
public String[] getContentTitles() { return new String[]{"", "", ""}; }
@@ -124,33 +117,6 @@ public class DiffPreviewPanel implements PreviewPanel {
myDispatcher.addListener(listener);
}
@NonNls private static final String LEFT_TEXT = "class MyClass {\n" +
" int value;\n" +
"\n" +
" void leftOnly() {}\n" +
"\n" +
" void foo() {\n" +
" // Left changes\n" +
" }\n" +
"}";
@NonNls private static final String CENTER_TEXT = "class MyClass {\n" +
" int value;\n" +
"\n" +
" void foo() {\n" +
" }\n" +
"\n" +
" void removedFromLeft() {}\n" +
"}";
@NonNls private static final String RIGHT_TEXT = "class MyClass {\n" +
" long value;\n" +
"\n" +
" void foo() {\n" +
" // Left changes\n" +
" }\n" +
"\n" +
" void removedFromLeft() {}\n" +
"}";
private class EditorClickListener extends EditorMouseAdapter implements CaretListener {
private final int myIndex;
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java
+57
View File
@@ -0,0 +1,57 @@
package com.intellij.openapi.diff.impl.settings;
import com.intellij.openapi.diff.DiffContent;
import com.intellij.openapi.diff.SimpleContent;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileTypes.StdFileTypes;
import org.jetbrains.annotations.NonNls;
/**
* @author oleg
* Implement this interface to enable custom diff preview in Colors & Fonts Settings page
*/
public abstract class DiffPreviewProvider {
public static final ExtensionPointName<DiffPreviewProvider> EP_NAME = ExtensionPointName.create("com.intellij.diffPreviewProvider");
public abstract DiffContent[] createContents();
public static DiffContent[] getContents() {
// Assuming that standalone IDE should provide one provider
for (DiffPreviewProvider diffPreviewProvider : Extensions.getExtensions(EP_NAME)) {
return diffPreviewProvider.createContents();
}
return new DiffContent[]{createContent(LEFT_TEXT), createContent(CENTER_TEXT), createContent(RIGHT_TEXT)};
}
private static SimpleContent createContent(String text) {
return new SimpleContent(text, StdFileTypes.JAVA);
}
@NonNls private static final String LEFT_TEXT = "class MyClass {\n" +
" int value;\n" +
"\n" +
" void leftOnly() {}\n" +
"\n" +
" void foo() {\n" +
" // Left changes\n" +
" }\n" +
"}";
@NonNls private static final String CENTER_TEXT = "class MyClass {\n" +
" int value;\n" +
"\n" +
" void foo() {\n" +
" }\n" +
"\n" +
" void removedFromLeft() {}\n" +
"}";
@NonNls private static final String RIGHT_TEXT = "class MyClass {\n" +
" long value;\n" +
"\n" +
" void foo() {\n" +
" // Left changes\n" +
" }\n" +
"\n" +
" void removedFromLeft() {}\n" +
"}";
}
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+2
View File
@@ -401,4 +401,6 @@
<extensionPoint name="testActionProvider" interface="com.intellij.execution.testframework.ToggleModelActionProvider"/>
<extensionPoint name="psiViewerExtension" interface="com.intellij.internal.psiView.PsiViewerExtension"/>
<extensionPoint name="diffPreviewProvider" interface="com.intellij.openapi.diff.impl.settings.DiffPreviewProvider"/>
</extensionPoints>