This repository has been archived by the owner on Apr 3, 2018. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
LANG: addendum to previous BuildManager changes.
- Loading branch information
1 parent
0044dec
commit 8ed2f3e
Showing
8 changed files
with
227 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/BuildMarkersUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2015, 2015 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 | ||
| * | ||
| * Contributors: | ||
| * Bruno Medeiros - initial API and implementation | ||
| *******************************************************************************/ | ||
| package melnorme.lang.ide.core.operations; | ||
|
|
||
| import static melnorme.utilbox.core.Assert.AssertNamespace.assertFail; | ||
|
|
||
| import org.eclipse.core.filebuffers.FileBuffers; | ||
| import org.eclipse.core.filebuffers.ITextFileBuffer; | ||
| import org.eclipse.core.filebuffers.ITextFileBufferManager; | ||
| import org.eclipse.core.filebuffers.LocationKind; | ||
| import org.eclipse.core.resources.IFile; | ||
| import org.eclipse.core.resources.IMarker; | ||
| import org.eclipse.core.resources.IResource; | ||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.jface.text.BadLocationException; | ||
| import org.eclipse.jface.text.IDocument; | ||
|
|
||
| import melnorme.lang.ide.core.LangCore; | ||
| import melnorme.lang.ide.core.LangCore_Actual; | ||
| import melnorme.lang.ide.core.utils.ResourceUtils; | ||
| import melnorme.lang.tooling.ast.SourceRange; | ||
| import melnorme.lang.tooling.data.StatusLevel; | ||
| import melnorme.lang.tooling.ops.SourceLineColumnRange; | ||
| import melnorme.lang.tooling.ops.ToolSourceMessage; | ||
| import melnorme.utilbox.core.CommonException; | ||
| import melnorme.utilbox.misc.Location; | ||
|
|
||
| public class BuildMarkersUtil { | ||
|
|
||
| public static void addErrorMarkers(Iterable<ToolSourceMessage> buildErrors, Location rootPath) throws CoreException { | ||
|
|
||
| for (ToolSourceMessage buildError : buildErrors) { | ||
| Location loc = rootPath.resolve(buildError.getFilePath()); // Absolute paths will remain unchanged. | ||
|
|
||
| IFile[] files = ResourceUtils.getWorkspaceRoot().findFilesForLocationURI(loc.toUri()); | ||
| for (IFile file : files) { | ||
| addErrorMarker(file, buildError, LangCore_Actual.BUILD_PROBLEM_ID); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static void addErrorMarker(IResource resource, ToolSourceMessage buildmessage, String markerType) | ||
| throws CoreException { | ||
| if(!resource.exists()) | ||
| return; | ||
|
|
||
| if(buildmessage.getMessageKind() == StatusLevel.OK) { | ||
| return; // Don't add message as a marker. | ||
| } | ||
|
|
||
| // TODO: check if marker already exists? | ||
| IMarker marker = resource.createMarker(markerType); | ||
|
|
||
| marker.setAttribute(IMarker.SEVERITY, severityFrom(buildmessage.getMessageKind())); | ||
| marker.setAttribute(IMarker.MESSAGE, buildmessage.getMessage()); | ||
|
|
||
| if(!(resource instanceof IFile)) { | ||
| return; | ||
| } | ||
|
|
||
| IFile file = (IFile) resource; | ||
|
|
||
| int line = buildmessage.getFileLineNumber(); | ||
| if(line >= 0) { | ||
| marker.setAttribute(IMarker.LINE_NUMBER, line); | ||
| } | ||
|
|
||
| SourceLineColumnRange range = buildmessage.range; | ||
|
|
||
| SourceRange messageSR; | ||
|
|
||
| ITextFileBufferManager fileBufferManager = FileBuffers.getTextFileBufferManager(); | ||
| fileBufferManager.connect(file.getFullPath(), LocationKind.IFILE, null); | ||
|
|
||
| try { | ||
| ITextFileBuffer tfb = fileBufferManager.getTextFileBuffer(file.getFullPath(), LocationKind.IFILE); | ||
| messageSR = getMessageRangeUsingDocInfo(range, tfb.getDocument()); | ||
| } finally { | ||
| fileBufferManager.disconnect(file.getFullPath(), LocationKind.IFILE, null); | ||
| } | ||
|
|
||
| if(messageSR != null) { | ||
| try { | ||
| marker.setAttribute(IMarker.CHAR_START, messageSR.getStartPos()); | ||
| marker.setAttribute(IMarker.CHAR_END, messageSR.getEndPos()); | ||
| } catch (CoreException ce) { | ||
| LangCore.logStatus(ce); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| protected static SourceRange getMessageRangeUsingDocInfo(SourceLineColumnRange range, IDocument doc) { | ||
|
|
||
| int charStart; | ||
| int charEnd; | ||
|
|
||
| int startLine; | ||
| int startColumn; | ||
|
|
||
| try { | ||
| try { | ||
| startLine = range.getValidLineIndex(); | ||
| startColumn = range.getValidColumnIndex(); | ||
|
|
||
| charStart = doc.getLineOffset(startLine) + startColumn; | ||
| } catch (CommonException ce) { | ||
| return null; | ||
| } | ||
|
|
||
| int endLine; | ||
| int endColumn; | ||
| try { | ||
| endLine = range.getValidEndLineIndex(); | ||
| endColumn = range.getValidEndColumnIndex(); | ||
|
|
||
| charEnd = doc.getLineOffset(endLine) + endColumn; | ||
|
|
||
| } catch (CommonException e) { | ||
| charEnd = charStart + 1; | ||
| } | ||
| } catch(BadLocationException e ) { | ||
| return null; | ||
| } | ||
|
|
||
| return SourceRange.srStartToEnd(charStart, charEnd); | ||
| } | ||
|
|
||
| public static int severityFrom(StatusLevel statusLevel) { | ||
| switch (statusLevel) { | ||
| case ERROR: return IMarker.SEVERITY_ERROR; | ||
| case WARNING: return IMarker.SEVERITY_WARNING; | ||
| case INFO: return IMarker.SEVERITY_INFO; | ||
| case OK: return IMarker.SEVERITY_INFO; // Shouldn't happen | ||
| } | ||
| throw assertFail(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/CommonBuildTargetOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2015, 2015 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 | ||
| * | ||
| * Contributors: | ||
| * Bruno Medeiros - initial API and implementation | ||
| *******************************************************************************/ | ||
| package melnorme.lang.ide.core.operations; | ||
|
|
||
| import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.core.runtime.IProgressMonitor; | ||
|
|
||
| import melnorme.utilbox.concurrency.OperationCancellation; | ||
| import melnorme.utilbox.core.CommonException; | ||
|
|
||
| public abstract class CommonBuildTargetOperation extends AbstractToolManagerOperation { | ||
|
|
||
| protected final OperationInfo parentOperationInfo; | ||
| protected final BuildTarget buildTarget; | ||
| protected final Path buildToolPath; | ||
| protected final boolean fullBuild; | ||
|
|
||
| public CommonBuildTargetOperation(OperationInfo parentOpInfo, IProject project, | ||
| Path buildToolPath, BuildTarget buildTarget, boolean fullBuild) { | ||
| super(project); | ||
| this.buildToolPath = buildToolPath; | ||
| this.fullBuild = fullBuild; | ||
| this.parentOperationInfo = assertNotNull(parentOpInfo); | ||
| this.buildTarget = assertNotNull(buildTarget); | ||
| } | ||
|
|
||
| protected Path getBuildToolPath2() throws CommonException { | ||
| return buildToolPath; | ||
| } | ||
|
|
||
| protected String getBuildTargetName() { | ||
| return buildTarget.getTargetName(); | ||
| } | ||
|
|
||
| @Override | ||
| public abstract void execute(IProgressMonitor pm) throws CoreException, CommonException, OperationCancellation; | ||
|
|
||
| } |
Oops, something went wrong.