Skip to content

Commit 4b92e3b

Browse files
zuluszulus
committed
Sync with PDT 5.0
1 parent 186f52e commit 4b92e3b

File tree

16 files changed

+73
-60
lines changed

16 files changed

+73
-60
lines changed

‎com.dubture.twig.core/Resources/parserTools/highlighting/TwigTokenizer.jflex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import org.eclipse.core.resources.IProject;
1919
import org.eclipse.php.core.PHPVersion;
2020
import com.dubture.twig.core.documentModel.parser.regions.TwigScriptRegion;
2121
import org.eclipse.php.internal.core.documentModel.parser.PHPRegionContext;
22-
import org.eclipse.php.internal.core.documentModel.parser.AbstractPhpLexer;
23-
import org.eclipse.php.internal.core.documentModel.parser.PhpLexerFactory;
24-
import org.eclipse.php.internal.core.documentModel.parser.regions.PhpScriptRegion;
22+
import org.eclipse.php.internal.core.documentModel.parser.AbstractPHPLexer;
23+
import org.eclipse.php.internal.core.documentModel.parser.PHPLexerFactory;
24+
import org.eclipse.php.internal.core.documentModel.parser.regions.PHPScriptRegion;
2525
import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
2626
import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTokenizer;
2727
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;

‎com.dubture.twig.core/src/com/dubture/twig/core/codeassist/SelectionEngine.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.eclipse.dltk.core.search.SearchEngine;
2222
import org.eclipse.dltk.internal.core.SourceModule;
2323
import org.eclipse.php.internal.core.codeassist.PHPSelectionEngine;
24-
import org.eclipse.php.internal.core.model.PhpModelAccess;
24+
import org.eclipse.php.internal.core.model.PHPModelAccess;
2525

2626
import com.dubture.twig.core.log.Logger;
2727
import com.dubture.twig.core.model.IFilter;
@@ -77,7 +77,7 @@ public boolean visit(TwigCallExpression s) throws Exception {
7777
for (IFunction function : functions) {
7878
if (function.getElementName().equals(s.getName())) {
7979
IDLTKSearchScope scope = SearchEngine.createSearchScope(function.getScriptProject());
80-
IMethod[] methods = PhpModelAccess.getDefault().findMethods(
80+
IMethod[] methods = PHPModelAccess.getDefault().findMethods(
8181
function.getInternalFunction(), MatchRule.EXACT, 0, 0, scope, null);
8282
if (methods.length == 1) {
8383
elements.add(methods[0]);
@@ -97,7 +97,7 @@ public boolean visit(Variable s) throws Exception {
9797
if (filter.getElementName().equals(s.getValue())) {
9898

9999
IDLTKSearchScope scope = SearchEngine.createSearchScope(filter.getScriptProject());
100-
IMethod[] methods = PhpModelAccess.getDefault()
100+
IMethod[] methods = PHPModelAccess.getDefault()
101101
.findMethods(filter.getInternalFunction(), MatchRule.EXACT, 0, 0, scope, null);
102102
if (methods.length == 1) {
103103
elements.add(methods[0]);

‎com.dubture.twig.core/src/com/dubture/twig/core/documentModel/parser/partitioner/TwigPartitionTypes.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.eclipse.jface.text.BadLocationException;
1212
import org.eclipse.jface.text.ITypedRegion;
1313
import org.eclipse.jface.text.TypedRegion;
14-
import org.eclipse.php.internal.core.documentModel.parser.regions.IPhpScriptRegion;
14+
import org.eclipse.php.internal.core.documentModel.parser.regions.IPHPScriptRegion;
1515
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
1616

1717
import com.dubture.twig.core.documentModel.parser.TwigRegionContext;
@@ -50,13 +50,13 @@ public static boolean isTwigPartition(String regionType) {
5050
* @return Starting region of the current partition
5151
* @throws BadLocationException
5252
*/
53-
public static final ITextRegion getPartitionStartRegion(IPhpScriptRegion region, int offset)
53+
public static final ITextRegion getPartitionStartRegion(IPHPScriptRegion region, int offset)
5454
throws BadLocationException {
5555
String partitionType = region.getPartition(offset);
56-
ITextRegion internalRegion = region.getPhpToken(offset);
56+
ITextRegion internalRegion = region.getPHPToken(offset);
5757
ITextRegion startRegion = internalRegion;
5858
while (internalRegion.getStart() != 0) {
59-
internalRegion = region.getPhpToken(internalRegion.getStart() - 1);
59+
internalRegion = region.getPHPToken(internalRegion.getStart() - 1);
6060
if (region.getPartition(internalRegion.getStart()) != partitionType) {
6161
break;
6262
}
@@ -75,7 +75,7 @@ public static final ITextRegion getPartitionStartRegion(IPhpScriptRegion region,
7575
* @return Starting offset of the current partition
7676
* @throws BadLocationException
7777
*/
78-
public static final int getPartitionStart(IPhpScriptRegion region, int offset) throws BadLocationException {
78+
public static final int getPartitionStart(IPHPScriptRegion region, int offset) throws BadLocationException {
7979
ITextRegion startRegion = getPartitionStartRegion(region, offset);
8080
return startRegion.getStart();
8181
}
@@ -90,13 +90,13 @@ public static final int getPartitionStart(IPhpScriptRegion region, int offset) t
9090
* @return Ending region of the current partition
9191
* @throws BadLocationException
9292
*/
93-
public static final ITextRegion getPartitionEndRegion(IPhpScriptRegion region, int offset)
93+
public static final ITextRegion getPartitionEndRegion(IPHPScriptRegion region, int offset)
9494
throws BadLocationException {
9595
String partitionType = region.getPartition(offset);
96-
ITextRegion internalRegion = region.getPhpToken(offset);
96+
ITextRegion internalRegion = region.getPHPToken(offset);
9797
ITextRegion endRegion = internalRegion;
9898
while (internalRegion.getEnd() != region.getLength()) {
99-
internalRegion = region.getPhpToken(internalRegion.getEnd());
99+
internalRegion = region.getPHPToken(internalRegion.getEnd());
100100
if (region.getPartition(internalRegion.getStart()) != partitionType) {
101101
break;
102102
}
@@ -115,7 +115,7 @@ public static final ITextRegion getPartitionEndRegion(IPhpScriptRegion region, i
115115
* @return Ending offset of the current partition
116116
* @throws BadLocationException
117117
*/
118-
public static final int getPartitionEnd(IPhpScriptRegion region, int offset) throws BadLocationException {
118+
public static final int getPartitionEnd(IPHPScriptRegion region, int offset) throws BadLocationException {
119119
ITextRegion endRegion = getPartitionEndRegion(region, offset);
120120
return endRegion.getEnd();
121121
}
@@ -130,7 +130,7 @@ public static final int getPartitionEnd(IPhpScriptRegion region, int offset) thr
130130
* @return typed region containing partition
131131
* @throws BadLocationException
132132
*/
133-
public static final ITypedRegion getPartition(IPhpScriptRegion region, int offset) throws BadLocationException {
133+
public static final ITypedRegion getPartition(IPHPScriptRegion region, int offset) throws BadLocationException {
134134
String partitionType = region.getPartition(offset);
135135
int startOffset = getPartitionStart(region, offset);
136136
int endOffset = getPartitionEnd(region, offset);

‎com.dubture.twig.core/src/com/dubture/twig/core/documentModel/parser/regions/TwigScriptRegion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.eclipse.jface.text.IDocument;
1818
import org.eclipse.php.internal.core.PHPCorePlugin;
1919
import org.eclipse.php.internal.core.documentModel.parser.Scanner.LexerState;
20-
import org.eclipse.php.internal.core.documentModel.parser.regions.IPhpScriptRegion;
20+
import org.eclipse.php.internal.core.documentModel.parser.regions.IPHPScriptRegion;
2121
import org.eclipse.wst.sse.core.internal.parser.ForeignRegion;
2222
import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
2323
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
@@ -293,7 +293,7 @@ public ITextRegion getTwigToken(int offset) throws BadLocationException {
293293
}
294294

295295
/**
296-
* @see IPhpScriptRegion#getPhpTokens(int, int)
296+
* @see IPHPScriptRegion#getPHPTokens(int, int)
297297
*/
298298
public final ITextRegion[] getTwigTokens(int offset, int length) throws BadLocationException {
299299
return tokensContainer.getTokens(offset, length);

‎com.dubture.twig.core/src/com/dubture/twig/core/format/CurlyCloseIndentationStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected IRegion getCurlyOpenLineInformation(IStructuredDocument document, int
6464
}
6565
int regionStart = sdRegion.getStartOffset(tRegion);
6666

67-
// in case of container we have the extract the PhpScriptRegion
67+
// in case of container we have the extract the PHPScriptRegion
6868
if (tRegion instanceof ITextRegionContainer) {
6969
ITextRegionContainer container = (ITextRegionContainer) tRegion;
7070
tRegion = container.getRegionAtCharacterOffset(offset);

‎com.dubture.twig.core/src/com/dubture/twig/core/format/DefaultIndentationStrategy.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private static ITextRegion getLastTokenRegion(final IStructuredDocument document
7474
}
7575
int regionStart = sdRegion.getStartOffset(tRegion);
7676

77-
// in case of container we have the extract the PhpScriptRegion
77+
// in case of container we have the extract the PHPScriptRegion
7878
if (tRegion instanceof ITextRegionContainer) {
7979
ITextRegionContainer container = (ITextRegionContainer) tRegion;
8080
tRegion = container.getRegionAtCharacterOffset(offset);
@@ -142,17 +142,17 @@ private static boolean isIndentationBase(final IStructuredDocument document, fin
142142
// the whole document
143143
final IStructuredDocumentRegion sdRegion = document.getRegionAtCharacterOffset(lineStart);
144144
// the whole PHP script
145-
ITextRegion phpScriptRegion = sdRegion.getRegionAtCharacterOffset(lineStart);
146-
int phpContentStartOffset = sdRegion.getStartOffset(phpScriptRegion);
145+
ITextRegion PHPScriptRegion = sdRegion.getRegionAtCharacterOffset(lineStart);
146+
int phpContentStartOffset = sdRegion.getStartOffset(PHPScriptRegion);
147147

148-
if (phpScriptRegion instanceof ITextRegionContainer) {
149-
ITextRegionContainer container = (ITextRegionContainer) phpScriptRegion;
150-
phpScriptRegion = container.getRegionAtCharacterOffset(lineStart);
151-
phpContentStartOffset += phpScriptRegion.getStart();
148+
if (PHPScriptRegion instanceof ITextRegionContainer) {
149+
ITextRegionContainer container = (ITextRegionContainer) PHPScriptRegion;
150+
PHPScriptRegion = container.getRegionAtCharacterOffset(lineStart);
151+
phpContentStartOffset += PHPScriptRegion.getStart();
152152
}
153153

154-
if (phpScriptRegion instanceof ITwigScriptRegion) {
155-
ITwigScriptRegion scriptRegion = (ITwigScriptRegion) phpScriptRegion;
154+
if (PHPScriptRegion instanceof ITwigScriptRegion) {
155+
ITwigScriptRegion scriptRegion = (ITwigScriptRegion) PHPScriptRegion;
156156
// the region we are trying to check if it is the indent base
157157
// for the line we need to format
158158
ContextRegion checkedRegion = (ContextRegion) scriptRegion
@@ -332,7 +332,7 @@ private static void placeStringIndentation(final IStructuredDocument document, i
332332
scriptRegion = sdRegion.getRegionAtCharacterOffset(offset);
333333
}
334334
int regionStart = sdRegion.getStartOffset(scriptRegion);
335-
// in case of container we have the extract the PhpScriptRegion
335+
// in case of container we have the extract the PHPScriptRegion
336336
if (scriptRegion instanceof ITextRegionContainer) {
337337
ITextRegionContainer container = (ITextRegionContainer) scriptRegion;
338338
scriptRegion = container.getRegionAtCharacterOffset(offset);
@@ -385,7 +385,7 @@ static boolean shouldIndent(final IStructuredDocument document, int offset, fina
385385
scriptRegion = sdRegion.getRegionAtCharacterOffset(offset);
386386
}
387387
int regionStart = sdRegion.getStartOffset(scriptRegion);
388-
// in case of container we have the extract the PhpScriptRegion
388+
// in case of container we have the extract the PHPScriptRegion
389389
if (scriptRegion instanceof ITextRegionContainer) {
390390
ITextRegionContainer container = (ITextRegionContainer) scriptRegion;
391391
scriptRegion = container.getRegionAtCharacterOffset(offset);

‎com.dubture.twig.core/src/com/dubture/twig/core/format/FormatterUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static String getRegionType(IStructuredDocument document, int offset) {
5050
tRegion = sdRegion.getRegionAtCharacterOffset(offset);
5151
}
5252
// in case the cursor on the beginning of '?>' tag
53-
// we decrease the offset to get the PhpScriptRegion
53+
// we decrease the offset to get the PHPScriptRegion
5454
if (tRegion.getType().equals(TwigRegionContext.TWIG_CLOSE)
5555
|| tRegion.getType().equals(TwigRegionContext.TWIG_STMT_CLOSE)) {
5656
tRegion = sdRegion.getRegionAtCharacterOffset(offset - 1);
@@ -92,15 +92,15 @@ public static String getPartitionType(IStructuredDocument document, int offset,
9292
tRegion = sdRegion.getRegionAtCharacterOffset(offset);
9393
}
9494
// in case the cursor on the beginning of '?>' tag
95-
// we decrease the offset to get the PhpScriptRegion
95+
// we decrease the offset to get the PHPScriptRegion
9696
if (tRegion.getType().equals(TwigRegionContext.TWIG_CLOSE)
9797
|| tRegion.getType().equals(TwigRegionContext.TWIG_STMT_CLOSE)) {
9898
tRegion = sdRegion.getRegionAtCharacterOffset(offset - 1);
9999
}
100100

101101
int regionStart = sdRegion.getStartOffset(tRegion);
102102

103-
// in case of container we have the extract the PhpScriptRegion
103+
// in case of container we have the extract the PHPScriptRegion
104104
if (tRegion != null && tRegion instanceof ITextRegionContainer) {
105105
ITextRegionContainer container = (ITextRegionContainer) tRegion;
106106
tRegion = container.getRegionAtCharacterOffset(offset);

‎com.dubture.twig.core/src/com/dubture/twig/core/index/TwigIndexingVisitorExtension.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.eclipse.dltk.ast.statements.Statement;
2424
import org.eclipse.dltk.core.ISourceModule;
2525
import org.eclipse.dltk.core.index2.IIndexingRequestor.ReferenceInfo;
26-
import org.eclipse.php.core.index.PhpIndexingVisitorExtension;
26+
import org.eclipse.php.core.index.PHPIndexingVisitorExtension;
2727
import org.eclipse.php.core.compiler.ast.nodes.ArrayCreation;
2828
import org.eclipse.php.core.compiler.ast.nodes.ArrayElement;
2929
import org.eclipse.php.core.compiler.ast.nodes.ClassDeclaration;
@@ -58,7 +58,7 @@
5858
* @author Robert Gruendler <r.gruendler@gmail.com>
5959
*/
6060
@SuppressWarnings("restriction")
61-
public class TwigIndexingVisitorExtension extends PhpIndexingVisitorExtension {
61+
public class TwigIndexingVisitorExtension extends PHPIndexingVisitorExtension {
6262

6363
protected boolean inTwigExtension;
6464
protected boolean inTokenParser;

‎com.dubture.twig.core/src/com/dubture/twig/core/util/text/TwigTextSequenceUtilities.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ public static TextSequence getStatement(int offset, IStructuredDocumentRegion sd
5252
tRegion = container.getRegionAtCharacterOffset(container.getStartOffset() + tRegion.getStart() - 1);
5353
}
5454

55-
// This text region must be of type PhpScriptRegion:
55+
// This text region must be of type PHPScriptRegion:
5656
if (tRegion != null && TwigTextSequenceUtilities.isTwigRegion(tRegion.getType())) {
5757
ITwigScriptRegion twigScriptRegion = (ITwigScriptRegion) tRegion;
5858

5959
try {
6060
// Set default starting position to the beginning of the
61-
// PhpScriptRegion:
61+
// PHPScriptRegion:
6262
int startOffset = container.getStartOffset() + twigScriptRegion.getStart();
6363

6464
// Now, search backwards for the statement start (in this
65-
// PhpScriptRegion):
65+
// PHPScriptRegion):
6666
ITextRegion startTokenRegion;
6767
if (documentOffset == startOffset) {
6868
startTokenRegion = twigScriptRegion.getTwigToken(0);

‎com.dubture.twig.ui/src/com/dubture/twig/ui/editor/LineStyleProviderForTwig.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.eclipse.jface.text.TextAttribute;
1818
import org.eclipse.jface.util.PropertyChangeEvent;
1919
import org.eclipse.php.internal.ui.Logger;
20-
import org.eclipse.php.internal.ui.editor.highlighter.LineStyleProviderForPhp;
20+
import org.eclipse.php.internal.ui.editor.highlighter.LineStyleProviderForPHP;
2121
import org.eclipse.swt.SWT;
2222
import org.eclipse.swt.custom.StyleRange;
2323
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
@@ -42,11 +42,11 @@
4242
*
4343
*/
4444
@SuppressWarnings({ "restriction", "unchecked" })
45-
public class LineStyleProviderForTwig extends LineStyleProviderForPhp {
45+
public class LineStyleProviderForTwig extends LineStyleProviderForPHP {
4646

4747
private IPreferenceStore twigColorPreferences;
4848

49-
private static final Map<String, String> fTwigColorTypes = new HashMap<String, String>();
49+
private static final Map<String, String> fTwigColorTypes = new HashMap<>();
5050

5151
static {
5252

@@ -100,6 +100,7 @@ protected TextAttribute getAttributeFor(String type) {
100100
return super.getAttributeFor(type);
101101
}
102102

103+
@Override
103104
public boolean prepareTextRegion(ITextRegionCollection blockedRegion, int partitionStartOffset, int partitionLength,
104105
Collection<StyleRange> holdResults) {
105106

@@ -347,6 +348,7 @@ public Map<String, String> getTwigColorTypesMap() {
347348
return fTwigColorTypes;
348349
}
349350

351+
@Override
350352
protected void handlePropertyChange(PropertyChangeEvent event) {
351353
if (event != null) {
352354
String prefKey = event.getProperty();
@@ -402,6 +404,7 @@ protected void handlePropertyChange(PropertyChangeEvent event) {
402404
}
403405
}
404406

407+
@Override
405408
public void loadColors() {
406409

407410
addTextAttribute(PreferenceConstants.EDITOR_NORMAL_COLOR);
@@ -422,10 +425,12 @@ public void loadColors() {
422425
addTextAttribute(PreferenceConstants.EDITOR_TASK_COLOR);
423426
}
424427

428+
@Override
425429
protected void clearColors() {
426430
getTextAttributes().clear();
427431
}
428432

433+
@Override
429434
protected void addTextAttribute(String colorKey) {
430435
if (getColorPreferences() != null) {
431436
String prefString = getColorPreferences().getString(colorKey);
@@ -436,6 +441,7 @@ protected void addTextAttribute(String colorKey) {
436441
}
437442
}
438443

444+
@Override
439445
protected void addDefaultTextAttribute(String colorKey) {
440446
if (getColorPreferences() != null) {
441447
String prefString = PreferenceConstants.EDITOR_NORMAL_DEFAULT_COLOR;
@@ -450,6 +456,7 @@ protected void addDefaultTextAttribute(String colorKey) {
450456
/*
451457
* Creates TextAttribute from the given style description array string
452458
*/
459+
@Override
453460
protected TextAttribute createTextAttribute(String[] stylePrefs) {
454461
int fontModifier = SWT.NORMAL;
455462
if (Boolean.valueOf(stylePrefs[2]).booleanValue()) { // bold
@@ -468,14 +475,17 @@ protected TextAttribute createTextAttribute(String[] stylePrefs) {
468475
EditorUtility.getColor(ColorHelper.toRGB(stylePrefs[1])), fontModifier);
469476
}
470477

478+
@Override
471479
public TextAttribute getTextAttributeForColor(String colorKey) {
472480
return (TextAttribute) getTextAttributes().get(colorKey);
473481
}
474482

483+
@Override
475484
public void setColorPreferences(IPreferenceStore preferenceStore) {
476485
twigColorPreferences = preferenceStore;
477486
}
478487

488+
@Override
479489
public IPreferenceStore getColorPreferences() {
480490
if (twigColorPreferences != null) {
481491
return twigColorPreferences;

0 commit comments

Comments
 (0)