make Find in Reference default to built-in PApplet methods (fixes #4224)

benfry · benfry · commit d78e828ef9a5 · 2016-09-08T12:09:49.000-04:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -166,7 +166,13 @@ protected void loadKeywords(File keywordFile,
               if (htmlFilename.endsWith("_")) {
                 keyword += "_";
               }
-              keywordToReference.put(keyword, htmlFilename);
+              // Allow the bare size() command to override the lookup
+              // for StringList.size() and others, but not vice-versa.
+              // https://github.com/processing/processing/issues/4224
+              boolean seen = keywordToReference.containsKey(keyword);
+              if (!seen || (seen && keyword.equals(htmlFilename))) {
+                keywordToReference.put(keyword, htmlFilename);
+              }
             }
           }
         }
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,8 @@
 0254 (3.2.2 or 3.3)
+X Find in reference for size() opens StringList.size()
+X   https://github.com/processing/processing/issues/4224
+X   though that's still imperfect:
+X   https://github.com/processing/processing/issues/4655
 X more font tweaks to make mono fonts work properly after #4639
 _   update the Linux notes based on where we land on this
 _   https://github.com/processing/processing/wiki/Supported-Platforms#linux

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,13 @@ protected void loadKeywords(File keywordFile,`
`166`	`166`	`if (htmlFilename.endsWith("_")) {`
`167`	`167`	`keyword += "_";`
`168`	`168`	`}`
`169`		`- keywordToReference.put(keyword, htmlFilename);`
	`169`	`+ // Allow the bare size() command to override the lookup`
	`170`	`+ // for StringList.size() and others, but not vice-versa.`
	`171`	`+ // https://github.com/processing/processing/issues/4224`
	`172`	`+ boolean seen = keywordToReference.containsKey(keyword);`
	`173`	`+ if (!seen \|\| (seen && keyword.equals(htmlFilename))) {`
	`174`	`+ keywordToReference.put(keyword, htmlFilename);`
	`175`	`+ }`
`170`	`176`	`}`
`171`	`177`	`}`
`172`	`178`	`}`