[#63] fix outline view for external files

fixes #63
LSP4E 0.23.0 is needed for this fix. Bundle version >= 0.16.1

Author: ghentschke

bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF

@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.jface;bundle-version="0.0.0",
  org.eclipse.jface.text;bundle-version="0.0.0",
- org.eclipse.lsp4e;bundle-version="0.0.0",
+ org.eclipse.lsp4e;bundle-version="0.16.1",
  org.eclipse.lsp4j;bundle-version="0.0.0",
  org.eclipse.ui.ide;bundle-version="0.0.0",
  org.eclipse.ui.workbench;bundle-version="0.0.0",

bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF

@@ -11,7 +11,7 @@ Bundle-Activator: org.eclipse.cdt.lsp.LspPlugin
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.lsp4e,
+ org.eclipse.lsp4e;bundle-version="0.16.1",
  org.eclipse.tm4e.ui,
  org.eclipse.tm4e.languageconfiguration,
  org.eclipse.ui.genericeditor,

bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/ui/navigator/CSymbolsContentProvider.java

@@ -69,6 +69,7 @@ public Object[] getChildren(Object parentElement) {
 		return NO_CHILDREN;
 	}
 
+	@Override
 	protected Object[] getTranslationUnitChildren(ITranslationUnit unit) throws CModelException {
 		if (unit.getResource() instanceof IFile) {
 			refreshTreeContentFromLS((IFile) unit.getResource());
@@ -102,11 +103,11 @@ protected void refreshTreeContentFromLS(IFile file) {
 				}
 			}
 			symbols.thenAcceptAsync(response -> {
-				symbolsModel.setFile(file);
+				symbolsModel.setUri(file.getLocationURI());
 				symbolsModel.update(response);
 			}).join();
 		} else {
-			symbolsModel.setFile(file);
+			symbolsModel.setUri(file.getLocationURI());
 			symbolsModel.update(null);
 		}
 

bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/ui/navigator/CSymbolsOpenActionProvider.java

@@ -54,7 +54,7 @@ public void run() {
 			if (fOpenElement != null) {
 				IEditorPart part;
 				try {
-					part = IDE.openEditor(this.page, fOpenElement.file);
+					part = IDE.openEditor(this.page, fOpenElement.uri, "org.eclipse.cdt.lsp.CEditor", false); //$NON-NLS-1$
 					revealInEditor(part, fOpenElement);
 				} catch (CoreException exc) {
 					Platform.getLog(getClass()).log(exc.getStatus());
@@ -85,7 +85,7 @@ private void revealInEditor(IEditorPart part, DocumentSymbolWithFile element) {
 			if (part instanceof ITextEditor) {
 				try {
 					var range = element.symbol.getSelectionRange();
-					var document = LSPEclipseUtils.getDocument(element.file);
+					var document = LSPEclipseUtils.getDocument(part.getEditorInput());
 					int startOffset = document.getLineOffset(range.getStart().getLine())
 							+ range.getStart().getCharacter();
 					int endOffset = document.getLineOffset(range.getEnd().getLine()) + range.getEnd().getCharacter();
@@ -158,7 +158,10 @@ private void fillOpenWithMenu(IMenuManager menu, IStructuredSelection selection)
 		}
 		IFile file;
 		if (selection.getFirstElement() instanceof DocumentSymbolWithFile) {
-			file = ((DocumentSymbolWithFile) selection.getFirstElement()).file;
+			file = LSPEclipseUtils.getFileHandle(((DocumentSymbolWithFile) selection.getFirstElement()).uri);
+			if (file == null) {
+				return;
+			}
 		} else {
 			return;
 		}

releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target

@@ -25,7 +25,7 @@
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/0.22.0/" />
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/" />
 			<unit id="org.eclipse.lsp4e" version="0.0.0" />
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.0" />
 		</location>