Changeset 3d0622cd77233477dd222f1c00c4f35afeb67815

Timestamp:

06/28/09 23:36:50 (14 months ago)

Author:

mb0 <mb0@…>

Children:

49cbb509af4876ed4a2ccd7942c17372373a5ae2

Parents:

80657c560c55a46e8bdb3bcc2aef994a475d2511

git-author:

mb0 <mb0@…> (06/10/09 03:01:59)

git-committer:

mb0 <mb0@…> (06/28/09 23:36:50)

Message:

moved editor related preferences from as3 preference to as3 editor preferences
editor preferences can now be used to override imp editor settings.
tab width can now be set for as3 editor.

new basic editor service that observes the life cycle of an as3 editor.
this is used to suppress the builder to build files that are currently edited.

Location:

org.axdt.as3

Files:

• plugin.xml (modified) (2 diffs)
• src/org/axdt/as3/imp/autoEdit/AS3AutoEditStrategy.java (modified) (2 diffs)
• src/org/axdt/as3/imp/builders/AS3Builder.java (modified) (5 diffs)
• src/org/axdt/as3/imp/foldingUpdater/AS3FoldingUpdater.java (modified) (3 diffs)
• src/org/axdt/as3/imp/services/AS3EditorService.java (added)
• src/org/axdt/as3/preferences/AS3EditorPreferencePage.java (modified) (1 diff)
• src/org/axdt/as3/preferences/AS3EditorPreferences.java (added)
• src/org/axdt/as3/preferences/AS3Preferences.java (modified) (2 diffs)
• src/org/axdt/as3/templates/AS3TemplateContext.java (modified) (2 diffs)

org.axdt.as3/plugin.xml

@@ -65 +65 @@
             language="AS3">
       </proposer>
+   </extension>
+   <extension
+         point="org.eclipse.imp.runtime.editorService">
+      <editorService
+            class="org.axdt.as3.imp.services.AS3EditorService"
+            language="AS3">
+      </editorService>
    </extension>
    <extension
@@ -240 +247 @@
             class="org.axdt.as3.preferences.AS3Preferences">
       </initializer>
+      <initializer
+            class="org.axdt.as3.preferences.AS3EditorPreferences">
+      </initializer>
    </extension>
    <extension

org.axdt.as3/src/org/axdt/as3/imp/autoEdit/AS3AutoEditStrategy.java

@@ -2 +2 @@
 
 import org.axdt.as3.AS3Plugin;
-import org.axdt.as3.preferences.AS3Preferences;
+import org.axdt.as3.preferences.AS3EditorPreferences;
 import org.axdt.util.AxdtTextHelper;
 import org.eclipse.imp.services.IAutoEditStrategy;
@@ -25 +25 @@
 
         public AS3AutoEditStrategy() {
-                IPreferenceStore store = AS3Preferences.getInstance().getStore();
-                ftab2Space = store.getBoolean(AS3Preferences.TAB_TO_SPACE);
-                fTabRatio = store.getInt(AS3Preferences.TAB_WIDTH);
-                fCloseString = store.getBoolean(AS3Preferences.CLOSE_STRINGS);
-                fCloseBrackets = store.getBoolean(AS3Preferences.CLOSE_BRACKETS);
-                fCloseBraces = store.getBoolean(AS3Preferences.CLOSE_BRACES);
-                fDeletePair = store.getBoolean(AS3Preferences.DELETE_PAIR);
+                IPreferenceStore store = AS3EditorPreferences.getInstance().getStore();
+                ftab2Space = store.getBoolean(AS3EditorPreferences.TAB_TO_SPACE);
+                fTabRatio = store.getInt(AS3EditorPreferences.TAB_WIDTH);
+                fCloseString = store.getBoolean(AS3EditorPreferences.CLOSE_STRINGS);
+                fCloseBrackets = store.getBoolean(AS3EditorPreferences.CLOSE_BRACKETS);
+                fCloseBraces = store.getBoolean(AS3EditorPreferences.CLOSE_BRACES);
+                fDeletePair = store.getBoolean(AS3EditorPreferences.DELETE_PAIR);
         }
 

org.axdt.as3/src/org/axdt/as3/imp/builders/AS3Builder.java

@@ -5 +5 @@
 import org.axdt.as3.AS3Plugin;
 import org.axdt.as3.imp.parser.AS3ParseController;
+import org.axdt.as3.imp.services.AS3EditorService;
 import org.axdt.as3.preferences.AS3Preferences;
 import org.axdt.as3.util.AS3Util;
@@ -22 +23 @@
 import org.eclipse.imp.model.ModelFactory.ModelException;
 import org.eclipse.imp.runtime.PluginBase;
-import org.eclipse.jface.preference.IPreferenceStore;
 
 /**
@@ -66 +66 @@
         protected boolean isSourceFile(IFile file) {
                 IPath path = file.getRawLocation();
-                if (path == null) return false;
+                if (path == null || !LANGUAGE.hasExtension(path.getFileExtension())) 
+                        return false;
                 IContainer sourceFolder = AS3Util.getSourceFolder(file);
-
-                if (sourceFolder == null) return false;
-
-                return LANGUAGE.hasExtension(path.getFileExtension());
+                return sourceFolder != null;
         }
 
@@ -100 +98 @@
          */
         protected boolean isOutputFolder(IResource resource) {
-                IPreferenceStore store = AS3Preferences.getInstance().getProjectStore(resource);
-                String deployPart = store.getString(AS3Preferences.DEPLOY_PATH);
-                IPath fullPath = resource.getFullPath();
-                return fullPath.toPortableString().endsWith(deployPart);
+                if (resource == null || !(resource instanceof IContainer)) return false;
+                IContainer deployContainer = AS3Preferences.getDeployPath(resource);
+                return resource.equals(deployContainer);
         }
 
@@ -112 +109 @@
         protected void compile(final IFile file, IProgressMonitor monitor) {
                 try {
-                        
+                        if (AS3EditorService.isOpen(file.getFullPath())) {
+                                // skip if editor is open. the parser scheduler will handle things
+                                AS3Plugin.getDefault().debug("skip build for opened file.");
+                        }
                         AS3ParseController parse = getParseController(file);
 

org.axdt.as3/src/org/axdt/as3/imp/foldingUpdater/AS3FoldingUpdater.java

@@ -5 +5 @@
 import java.util.List;
 
+import lpg.runtime.Adjunct;
+import lpg.runtime.ILexStream;
+import lpg.runtime.IPrsStream;
+import lpg.runtime.IToken;
+
+import org.axdt.as3.imp.parser.Ast.ASTNode;
+import org.axdt.as3.imp.parser.Ast.AbstractVisitor;
+import org.axdt.as3.imp.parser.Ast.Block;
+import org.axdt.as3.imp.parser.Ast.FunctionDefinition;
+import org.axdt.as3.imp.parser.Ast.ImportDirectiveList;
+import org.axdt.as3.imp.parser.Ast.InterfaceBlock;
+import org.axdt.as3.imp.parser.Ast.PackageDefinition;
+import org.axdt.as3.preferences.AS3EditorPreferences;
 import org.eclipse.imp.parser.IParseController;
 import org.eclipse.imp.parser.ISourcePositionLocator;
@@ -13 +26 @@
 import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
 import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
-
-import org.axdt.as3.imp.parser.Ast.*;
-import org.axdt.as3.preferences.AS3Preferences;
-
-import lpg.runtime.*;
 
 /**
@@ -30 +38 @@
 
         public AS3FoldingUpdater() {
-                IPreferenceStore store = AS3Preferences.getInstance().getStore();
-                useFolding = store.getBoolean(AS3Preferences.USE_FOLDING);
-                foldComments = store.getBoolean(AS3Preferences.FOLD_COMMENTS);
-                foldHeaders = store.getBoolean(AS3Preferences.FOLD_HEADERS);
-                foldImports = store.getBoolean(AS3Preferences.FOLD_IMPORTS);
-                foldMembers = store.getBoolean(AS3Preferences.FOLD_MEMBERS);
+                IPreferenceStore store = AS3EditorPreferences.getInstance().getStore();
+                useFolding = store.getBoolean(AS3EditorPreferences.USE_FOLDING);
+                foldComments = store.getBoolean(AS3EditorPreferences.FOLD_COMMENTS);
+                foldHeaders = store.getBoolean(AS3EditorPreferences.FOLD_HEADERS);
+                foldImports = store.getBoolean(AS3EditorPreferences.FOLD_IMPORTS);
+                foldMembers = store.getBoolean(AS3EditorPreferences.FOLD_MEMBERS);
                 autoFolds = new ArrayList<Annotation>();
         }

org.axdt.as3/src/org/axdt/as3/preferences/AS3EditorPreferencePage.java

@@ -2 +2 @@
 
 import org.axdt.preferences.AbstractPreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
 public class AS3EditorPreferencePage extends AbstractPreferencePage {
-        private static final String IMP_PREF_PAGE = "org.eclipse.imp.runtime.preferencePage";
 
         public AS3EditorPreferencePage() {
-                super(AS3Preferences.getInstance(), AS3Preferences.PAGE_EDITOR);
+                super(AS3EditorPreferences.getInstance());
         }
 
-        @Override
-        protected Control createContents(Composite parent) {
-                parent = (Composite) super.createContents(parent);
-                new PreferenceLinkArea(parent, SWT.NONE, IMP_PREF_PAGE,
-                                "See <a>IMP Preference</a> for tab width and font preference",
-                                (IWorkbenchPreferenceContainer)getContainer(), null);
-                return parent;
-        }
 }

org.axdt.as3/src/org/axdt/as3/preferences/AS3Preferences.java

@@ -10 +10 @@
 public class AS3Preferences extends AbstractPreferences {
 
-        public final static String PAGE_EDITOR = "PAGE_EDITOR";
-
         public final static String SOURCE_PATHS = "SOURCE_PATHS";
         public final static String LIBRARY_PATHS = "LIBRARY_PATHS";
         public final static String DEPLOY_PATH = "DEPLOY_PATH";
         public final static String CONFIG_PATH = "CONFIG_PATH";
-        public final static String TAB_TO_SPACE = "TAB_TO_SPACE";
-        public final static String TAB_WIDTH = "TAB_WIDTH";
-        public final static String CLOSE_STRINGS = "CLOSE_STRINGS";
-        public final static String CLOSE_BRACKETS = "CLOSE_BRACKETS";
-        public final static String CLOSE_BRACES = "CLOSE_BRACES";
-        public final static String DELETE_PAIR = "DELETE_PAIR";
-        public final static String USE_FOLDING = "USE_FOLDING";
-        public final static String FOLD_COMMENTS = "FOLD_COMMENTS";
-        public final static String FOLD_HEADERS = "FOLD_HEADERS";
-        public final static String FOLD_IMPORTS = "FOLD_IMPORTS";
-        public final static String FOLD_MEMBERS = "FOLD_MEMBERS";
 
         private static AS3Preferences instance;
@@ -51 +38 @@
                 add(CONFIG_PATH, "&Config path", "config");
                 add(LIBRARY_PATHS, "&Library &paths", "lib");
-                addPage(PAGE_EDITOR, "");
-                addGroup(null, false);
-                add(TAB_TO_SPACE, "Convert &tabs", false);
-                add(TAB_WIDTH, "to number of spa&ces", 4);
-                add(USE_FOLDING, "Enable &folding", true);
-                addGroup("Initially fold these elements:", true);
-                add(FOLD_COMMENTS, "&Comments", false);
-                add(FOLD_HEADERS, "&Header comments", true);
-                add(FOLD_MEMBERS, "&Members", false);
-                add(FOLD_IMPORTS, "&Imports", true);
-                addGroup("Automatically close", true);
-                add(CLOSE_STRINGS, "\"&Strings\"", true);
-                add(CLOSE_BRACKETS, "(Parentheses) and [Brac&kets]", true);
-                add(CLOSE_BRACES, "{&Braces} on newline", true);
-                endGroup();
-                add(DELETE_PAIR, "Delete right matching pair (if direct neighbor)", true);
         }
 

org.axdt.as3/src/org/axdt/as3/templates/AS3TemplateContext.java

@@ -6 +6 @@
 import java.util.StringTokenizer;
 
-import org.axdt.as3.preferences.AS3Preferences;
+import org.axdt.as3.preferences.AS3EditorPreferences;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.BadLocationException;
@@ -32 +32 @@
                 String pattern = template.getPattern();
                 String delim = d.getLegalLineDelimiters()[0];
-                IPreferenceStore store = AS3Preferences.getInstance().getStore();
-                boolean tab2Space = store.getBoolean(AS3Preferences.TAB_TO_SPACE);
-                int tabWidth = store.getInt(AS3Preferences.TAB_WIDTH);
+                IPreferenceStore store = AS3EditorPreferences.getInstance().getStore();
+                boolean tab2Space = store.getBoolean(AS3EditorPreferences.TAB_TO_SPACE);
+                int tabWidth = store.getInt(AS3EditorPreferences.TAB_WIDTH);
                 StringBuffer buf = new StringBuffer();
                 for (int i = 0; i < tabWidth; i++)