Merge remote-tracking branch 'origin/4.13' into master

Change-Id: I3f2a6c553819e992da7e9f538dc44b95b482359e
2020-10-02 10:47:07 +02:00
parent 528b634e5a b6b6482c72
commit 8b031c8c05
95 changed files with 1825 additions and 698 deletions
--- a/src/libs/qmljs/parser/qmljsast_p.h
+++ b/src/libs/qmljs/parser/qmljsast_p.h
@@ -3394,14 +3394,17 @@ public:

    SourceLocation firstSourceLocation() const override
    {
-      if (defaultToken.isValid())
-        return defaultToken;
-      else if (readonlyToken.isValid())
-          return readonlyToken;
-      else if (requiredToken.isValid())
-          return requiredToken;
+        if (requiredToken.isValid()) {
+            if (defaultToken.isValid() && defaultToken.offset < requiredToken.offset)
+                return defaultToken;
+            return requiredToken;
+        }
+        if (defaultToken.isValid())
+            return defaultToken;
+        if (readonlyToken.isValid())
+            return readonlyToken;

-      return propertyToken;
+        return propertyToken;
    }

    SourceLocation lastSourceLocation() const override