minor fixes in renaming logic

Author: kammeows

client/modules/IDE/components/Editor/index.jsx

@@ -561,11 +561,18 @@ class Editor extends React.Component {
     const fromPos =
       CodeMirror.cmpPos(sel.anchor, sel.head) <= 0 ? sel.anchor : sel.head;
 
-    showRenameDialog(tokenType, cursorCoords, selection, (newName) => {
-      if (newName && newName.trim() !== '' && newName !== selection) {
-        handleRename(fromPos, selection, newName, cm);
+    showRenameDialog(
+      cm,
+      fromPos,
+      tokenType,
+      cursorCoords,
+      selection,
+      (newName) => {
+        if (newName && newName.trim() !== '' && newName !== selection) {
+          handleRename(fromPos, selection, newName, cm);
+        }
       }
-    });
+    );
   }
 
   initializeDocuments(files) {

client/utils/rename-variable.js

@@ -86,6 +86,15 @@ function startRenaming(cm, ast, fromPos, newName, oldName) {
 
       // Handle renaming inside classes
       if (isInsideClassContext) {
+        const tempPos = {
+          line: pos.line,
+          ch: pos.ch + oldName.length
+        };
+        const token = cm.getTokenAt(tempPos);
+        const tokenType = token.type;
+
+        if (tokenType === 'property' && baseContext !== thisContext) return;
+
         const classContext = getClassContext(cm, ast, fromPos);
         let baseMethodName = null;
         if (classContext && classContext.includes('.')) {
@@ -157,6 +166,15 @@ function startRenaming(cm, ast, fromPos, newName, oldName) {
       }
       // Handle renaming outside classes
       else {
+        const tempPos = {
+          line: pos.line,
+          ch: pos.ch + oldName.length
+        };
+        const token = cm.getTokenAt(tempPos);
+        const tokenType = token.type;
+
+        if (tokenType === 'property') return;
+
         const thisScopeVars = scopeToDeclaredVarsMap[thisContext] || {};
         const baseScopeVars = scopeToDeclaredVarsMap[baseContext] || {};
         const globalScopeVars = scopeToDeclaredVarsMap.global || {};

client/utils/showRenameDialog.jsx

@@ -1,10 +1,27 @@
 import announceToScreenReader from './ScreenReaderHelper';
+import p5CodeAstAnalyzer from './p5CodeAstAnalyzer';
+import { getClassContext, getContext, getAST } from './renameVariableHelper';
 
 const allFuncs = require('./p5-reference-functions.json');
 
 const allFunsList = new Set(allFuncs.functions.list);
 
-function isValidIdentifierSelection(selection, tokenType) {
+function isValidIdentifierSelection(cm, fromPos, selection, tokenType) {
+  const { scopeToDeclaredVarsMap = {}, userDefinedClassMetadata = {} } =
+    p5CodeAstAnalyzer(cm) || {};
+  const ast = getAST(cm);
+
+  const baseContext = getContext(
+    cm,
+    ast,
+    fromPos,
+    scopeToDeclaredVarsMap,
+    userDefinedClassMetadata
+  );
+
+  const isInsideClassContext = baseContext in userDefinedClassMetadata;
+
+  if (tokenType === 'property' && !isInsideClassContext) return false;
   if (!selection || selection.trim() === '') return false;
   if (
     tokenType === 'comment' ||
@@ -141,10 +158,17 @@ function openRenameInputDialog(coords, oldName, onSubmit) {
   });
 }
 
-export default function showRenameDialog(tokenType, coords, oldName, onSubmit) {
+export default function showRenameDialog(
+  cm,
+  fromPos,
+  tokenType,
+  coords,
+  oldName,
+  onSubmit
+) {
   if (
     (allFunsList.has(oldName) && tokenType !== 'p5-variable') ||
-    !isValidIdentifierSelection(oldName, tokenType)
+    !isValidIdentifierSelection(cm, fromPos, oldName, tokenType)
   ) {
     showTemporaryDialog(coords, 'You cannot rename this element');
     announceToScreenReader(`The word ${oldName} cannot be renamed`, true);