Commit 2b41b6a2 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* tracing refinements

parent 3a6d1abd

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/contentassist/TDLtxProposalProvider.java

+17 −24
Original line number Diff line number Diff line
@@ -119,6 +119,18 @@ public class TDLtxProposalProvider extends AbstractTDLtxProposalProvider { 
		}

	}



	private void traceUI(ContentAssistContext contentAssistContext, ICompletionProposalAcceptor acceptor,

			String name) {

		ICompletionProposal proposal = createCompletionProposal("--TRACE", new StyledString("---TRACE"), null, 1000000001, "", contentAssistContext);

		((ConfigurableCompletionProposal)proposal).setAdditionalProposalInfo(trace);



//		Collection<ICompletionProposal> proposals = (Collection<ICompletionProposal>) getProposals(acceptor);

//		List<String> proposalDescriptions = proposals.stream().map(ICompletionProposal::getDisplayString).filter(e -> !e.startsWith("--")).toList();

//		ICompletionProposal proposal = createCompletionProposal(name, new StyledString(name), null, 1000000001, "", contentAssistContext);

//		((ConfigurableCompletionProposal)proposal).setAdditionalProposalInfo(String.join("\n", proposalDescriptions));

		acceptor.accept(proposal);

	}



	private Object getProposals(ICompletionProposalAcceptor acceptor) {

		try {

			CompletionProposalComputer completionProposalComputer;
@@ -149,18 +161,11 @@ public class TDLtxProposalProvider extends AbstractTDLtxProposalProvider { 
		superRule = true;

		superReference = true;

		superContainment = true;

		super.createProposals(context, acceptor);

		if (traceCompletions) {

			Collection<ICompletionProposal> proposals = (Collection<ICompletionProposal>) getProposals(acceptor);

			if (!proposals.stream().anyMatch(e -> e.getDisplayString().startsWith("---"))) {

		trace = "";

		super.createProposals(context, acceptor);

		if (traceCompletionsInUI) {

			traceUI(context, acceptor, trace);

		}

//			System.out.println("Complete: -----------------------------------------------------");

//			for (AbstractElement element : context.getFirstSetGrammarElements()) {

//				System.out.println("--P: "+element);

//			}

		}



	}

	

	@Override
@@ -171,20 +176,8 @@ public class TDLtxProposalProvider extends AbstractTDLtxProposalProvider { 
		postTrace(acceptor);

		if (traceCompletionsInUI) {

			String name = "--R: "+getName(ruleCall) + " : "+contentAssistContext.getCurrentModel().eClass().getName();

			traceUI(contentAssistContext, acceptor, name);

		}

			//traceUI(contentAssistContext, acceptor, name);

		}



	private void traceUI(ContentAssistContext contentAssistContext, ICompletionProposalAcceptor acceptor,

			String name) {

		ICompletionProposal proposal = createCompletionProposal("--TRACE", new StyledString("---TRACE"), null, 1000000001, "", contentAssistContext);

		((ConfigurableCompletionProposal)proposal).setAdditionalProposalInfo(trace);



		Collection<ICompletionProposal> proposals = (Collection<ICompletionProposal>) getProposals(acceptor);

		List<String> proposalDescriptions = proposals.stream().map(ICompletionProposal::getDisplayString).filter(e -> !e.startsWith("--")).toList();

//		ICompletionProposal proposal = createCompletionProposal(name, new StyledString(name), null, 1000000001, "", contentAssistContext);

//		((ConfigurableCompletionProposal)proposal).setAdditionalProposalInfo(String.join("\n", proposalDescriptions));

		acceptor.accept(proposal);

	}



	@Override
@@ -195,7 +188,7 @@ public class TDLtxProposalProvider extends AbstractTDLtxProposalProvider { 
		postTrace(acceptor);

		if (traceCompletionsInUI) {

			String name = "--A: "+getName(assignment) + " : "+contentAssistContext.getCurrentModel().eClass().getName();

			traceUI(contentAssistContext, acceptor, name);

			//traceUI(contentAssistContext, acceptor, name);

		}

	}