mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-04 14:13:24 +02:00
Code Issues Wiki Activity

Bug 278967 - Content assist on "../" results in an error

Browse source
This commit is contained in:
Anton Leherbauer 2009-12-14 08:45:16 +00:00
parent a326de8cbd
commit 986dc3753a
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
View file

@ -982,6 +982,14 @@ public class CompletionTests extends AbstractContentAssistTest {
"\"sub1/inc11.h" "\"sub1/inc11.h"
}; };
assertCompletionResults(fCursorOffset+=4, expected, AbstractContentAssistTest.COMPARE_REP_STRINGS); assertCompletionResults(fCursorOffset+=4, expected, AbstractContentAssistTest.COMPARE_REP_STRINGS);
// bug 278967
getDocument().replace(fCursorOffset-5, 5, "../");
expected= new String[] {
"\"../h1/",
"\"../h2/",
};
assertCompletionResults(fCursorOffset-=2, expected, AbstractContentAssistTest.COMPARE_REP_STRINGS);
} finally { } finally {
deleteDir(tempDir); deleteDir(tempDir);
} }

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/InclusionProposalComputer.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008 Wind River Systems, Inc. and others. * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -279,12 +279,16 @@ public class InclusionProposalComputer implements ICompletionProposalComputer {
} else if (prefixPath.hasTrailingSeparator()) { } else if (prefixPath.hasTrailingSeparator()) {
namePrefix= ""; //$NON-NLS-1$ namePrefix= ""; //$NON-NLS-1$
prefixPath= prefixPath.removeTrailingSeparator(); prefixPath= prefixPath.removeTrailingSeparator();
parent= parent.getFolder(prefixPath);
} else { } else {
namePrefix= prefixPath.lastSegment(); namePrefix= prefixPath.lastSegment();
prefixPath= prefixPath.removeLastSegments(1); prefixPath= prefixPath.removeLastSegments(1);
if (prefixPath.segmentCount() > 0) { }
if (prefixPath.segmentCount() > 0) {
IPath parentPath = parent.getFullPath().append(prefixPath);
if (parentPath.segmentCount() > 0) {
parent= parent.getFolder(prefixPath); parent= parent.getFolder(prefixPath);
} else {
return;
} }
} }
if (!parent.exists()) { if (!parent.exists()) {