Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.plugin.core / src / net / mograsim / plugin / asm / editor / AsmContentAssistProcessor.java

diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/editor/AsmContentAssistProcessor.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/editor/AsmContentAssistProcessor.java
index f81f7c0..c2b8f3f 100644 (file)
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/editor/AsmContentAssistProcessor.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/asm/editor/AsmContentAssistProcessor.java
@@ -13,6 +13,8 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 
+import net.mograsim.plugin.AsmOps;
+
 public class AsmContentAssistProcessor implements IContentAssistProcessor
 {
 
@@ -43,8 +45,7 @@ public class AsmContentAssistProcessor implements IContentAssistProcessor
 //             }
 //             return new ICompletionProposal[0];
 //             text.
-               return new ICompletionProposal[] { new AsmOperationProposal("ADD", "Addition operation", offset),
-                               new AsmOperationProposal("MUL", "Multiplication operation", offset) };
+               return AsmOps.ops.stream().map(o -> new AsmOperationProposal(o, "", offset)).toArray(ICompletionProposal[]::new);
        }
 
        @Override
@@ -56,7 +57,7 @@ public class AsmContentAssistProcessor implements IContentAssistProcessor
        @Override
        public char[] getCompletionProposalAutoActivationCharacters()
        {
-               return new char[] { '\t' }; // NON-NLS-1
+               return new char[] { '\n', '\r' }; // NON-NLS-1
        }
 
        @Override