Preparing for 3.1.3 release

Author: bobbylight

build.gradle

@@ -16,17 +16,18 @@ archivesBaseName = 'languagesupport'
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.1.3'
-    api 'com.fifesoft:autocomplete:3.1.2'
+    api('com.fifesoft:rsyntaxtextarea:3.1.4') { changing = true }
+    api 'com.fifesoft:autocomplete:3.1.3'
 	implementation 'org.mozilla:rhino:1.7.6'
     testImplementation 'junit:junit:4.13.2'
 }
 
 wrapper {
-    gradleVersion = '7.0.2'
+    gradleVersion = '7.3.1'
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots'

gradle.properties

@@ -1,6 +1,6 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
-version=3.1.3-SNAPSHOT
+version=3.1.3
 
 # Ugh, see https://github.com/gradle/gradle/issues/11308
 systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/fife/rsta/ac/demo/DemoRootPane.java

@@ -208,6 +208,7 @@ RSyntaxTextArea getTextArea() {
 	 */
 	@Override
 	public void hyperlinkUpdate(HyperlinkEvent e) {
+	    System.out.println("Hyperlink event: " + e.getEventType());
 		if (e.getEventType()==HyperlinkEvent.EventType.ACTIVATED) {
 			URL url = e.getURL();
 			if (url==null) {

src/main/java/org/fife/rsta/ac/php/PhpCompletionProvider.java

@@ -60,6 +60,8 @@ public class PhpCompletionProvider extends HtmlCompletionProvider {
 	 */
 	private List<Completion> phpCompletions;
 
+    // TODO: Make PHPTokenMaker.INTERNAL_IN_PHP public!  Or come up with a better way to do this
+    private static final int EVERYTHING_HERE_AND_BELOW_IS_PHP = -(4<<11);//PHPTokenMaker.INTERNAL_IN_PHP;
 
 	public PhpCompletionProvider() {
 
@@ -227,11 +229,11 @@ else if (ch1=='?' && ch2=='>') {
 		}
 
 		// Check if previous line ended in a PHP block.
-		// HACK: This relies on insider knowledge of PhpTokenmaker! All
+		// HACK: This relies on insider knowledge of PhpTokenMaker! All
 		// PHP-related states have the "lowest" token types.
 		if (!inPhp && line>0) {
 			int prevLineEndType = doc.getLastTokenTypeOnLine(line-1);
-			if (prevLineEndType<=PHPTokenMaker.INTERNAL_IN_PHP) {
+			if (prevLineEndType <= EVERYTHING_HERE_AND_BELOW_IS_PHP) {
 				inPhp = true;
 			}
 		}