Merge branch 'develop' into font_size

Author: raclim

client/components/Nav.jsx

@@ -278,6 +278,7 @@ class Nav extends React.PureComponent {
             onClick={this.toggleDropdownForFile}
             onBlur={this.handleBlur}
             onFocus={this.clearHideTimeout}
+            title="File"
             onMouseOver={() => {
               if (this.state.dropdownOpen !== 'none') {
                 this.setDropdown('file');
@@ -396,6 +397,7 @@ class Nav extends React.PureComponent {
             onClick={this.toggleDropdownForEdit}
             onBlur={this.handleBlur}
             onFocus={this.clearHideTimeout}
+            title="Edit"
             onMouseOver={() => {
               if (this.state.dropdownOpen !== 'none') {
                 this.setDropdown('edit');
@@ -454,6 +456,7 @@ class Nav extends React.PureComponent {
             onClick={this.toggleDropdownForSketch}
             onBlur={this.handleBlur}
             onFocus={this.clearHideTimeout}
+            title="Sketch"
             onMouseOver={() => {
               if (this.state.dropdownOpen !== 'none') {
                 this.setDropdown('sketch');
@@ -539,6 +542,7 @@ class Nav extends React.PureComponent {
             onClick={this.toggleDropdownForHelp}
             onBlur={this.handleBlur}
             onFocus={this.clearHideTimeout}
+            title="Help"
             onMouseOver={() => {
               if (this.state.dropdownOpen !== 'none') {
                 this.setDropdown('help');
@@ -600,6 +604,7 @@ class Nav extends React.PureComponent {
             onClick={this.toggleDropdownForLang}
             onBlur={this.handleBlur}
             onFocus={this.clearHideTimeout}
+            title="Language"
             onMouseOver={() => {
               if (this.state.dropdownOpen !== 'none') {
                 this.setDropdown('lang');
@@ -760,15 +765,15 @@ class Nav extends React.PureComponent {
           this.renderLanguageMenu(navDropdownState)}
         <li className="nav__item">
           <Link to="/login" className="nav__auth-button">
-            <span className="nav__item-header">
+            <span className="nav__item-header" title="Login">
               {this.props.t('Nav.Login')}
             </span>
           </Link>
         </li>
         <span className="nav__item-or">{this.props.t('Nav.LoginOr')}</span>
         <li className="nav__item">
           <Link to="/signup" className="nav__auth-button">
-            <span className="nav__item-header">
+            <span className="nav__item-header" title="SignUp">
               {this.props.t('Nav.SignUp')}
             </span>
           </Link>

client/components/__snapshots__/Nav.unit.test.jsx.snap

@@ -22,7 +22,9 @@ exports[`Nav renders correctly 1`] = `
         <li
           class="nav__item"
         >
-          <button>
+          <button
+            title="File"
+          >
             <span
               class="nav__item-header"
             />
@@ -65,7 +67,9 @@ exports[`Nav renders correctly 1`] = `
         <li
           class="nav__item"
         >
-          <button>
+          <button
+            title="Edit"
+          >
             <span
               class="nav__item-header"
             />
@@ -116,7 +120,9 @@ exports[`Nav renders correctly 1`] = `
         <li
           class="nav__item"
         >
-          <button>
+          <button
+            title="Sketch"
+          >
             <span
               class="nav__item-header"
             />
@@ -166,7 +172,9 @@ exports[`Nav renders correctly 1`] = `
         <li
           class="nav__item"
         >
-          <button>
+          <button
+            title="Help"
+          >
             <span
               class="nav__item-header"
             />

client/utils/p5-javascript.js

@@ -158,14 +158,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
       var word = stream.current()
-      if (state.lastType != ".") {
-        if (keywords.propertyIsEnumerable(word)) {
-          var kw = keywords[word]
-          return ret(kw.type, kw.style, word)
-        }
-        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
-          return ret("async", "keyword", word)
+      if (keywords.propertyIsEnumerable(word)) {
+        var kw = keywords[word]
+        return ret(kw.type, kw.style, word)
       }
+      if (state.lastType != "." && word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+        return ret("async", "keyword", word)
       return ret("variable", "variable", word)
     }
   }
@@ -285,6 +283,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (combinator(type, content)) {
         while(cc.length && cc[cc.length - 1].lex)
           cc.pop()();
+        if (style?.slice(0, 2) === "p5") return style;
         if (cx.marked) return cx.marked;
         if (type == "variable" && inScope(state, content)) return "variable-2";
         return style;