Skip to content

Commit 8e1aeda

Browse files
committed
More array and map expression formatting
1 parent 65fd187 commit 8e1aeda

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

src/core/expression/qgsexpression.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -903,45 +903,50 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
903903
}
904904
else if ( value.type() == QVariant::Map )
905905
{
906-
QString mapStr = QStringLiteral( "{ " );
906+
QString mapStr = QStringLiteral( "{" );
907907
const QVariantMap map = value.toMap();
908908
QString separator;
909909
for ( QVariantMap::const_iterator it = map.constBegin(); it != map.constEnd(); ++it )
910910
{
911911
mapStr.append( separator );
912912
if ( separator.isEmpty() )
913-
separator = QStringLiteral( ", " );
913+
separator = QStringLiteral( "," );
914914

915-
mapStr.append( QStringLiteral( "%1: %2" ).arg( quotedValue( it.key() ), formatPreviewString( it.value() ) ) );
916-
if ( mapStr.length() > MAX_PREVIEW + 5 )
915+
mapStr.append( QStringLiteral( " %1: %2" ).arg( quotedValue( it.key() ), formatPreviewString( it.value() ) ) );
916+
if ( mapStr.length() > MAX_PREVIEW - 3 )
917917
{
918-
mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW ) );
918+
mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW - 2 ) );
919919
break;
920920
}
921921
}
922-
mapStr += QStringLiteral( " }" );
923-
return tr( "<i>&lt;%1&gt;</i>" ).arg( mapStr );
922+
if ( !map.empty() )
923+
mapStr += QStringLiteral( " " );
924+
mapStr += QStringLiteral( "}" );
925+
return mapStr;
924926
}
925927
else if ( value.type() == QVariant::List || value.type() == QVariant::StringList )
926928
{
927-
QString listStr = QStringLiteral( "[ " );
929+
QString listStr = QStringLiteral( "[" );
928930
const QVariantList list = value.toList();
929931
QString separator;
930932
for ( const QVariant &arrayValue : list )
931933
{
932934
listStr.append( separator );
933935
if ( separator.isEmpty() )
934-
separator = QStringLiteral( ", " );
936+
separator = QStringLiteral( "," );
935937

938+
listStr.append( " " );
936939
listStr.append( formatPreviewString( arrayValue ) );
937-
if ( listStr.length() > MAX_PREVIEW + 5 )
940+
if ( listStr.length() > MAX_PREVIEW - 3 )
938941
{
939-
listStr = QString( tr( "%1…" ) ).arg( listStr.left( MAX_PREVIEW ) );
942+
listStr = QString( tr( "%1…" ) ).arg( listStr.left( MAX_PREVIEW - 2 ) );
940943
break;
941944
}
942945
}
943-
listStr += QStringLiteral( " ]" );
944-
return tr( "<i>&lt;%1&gt;</i>" ).arg( listStr );
946+
if ( !list.empty() )
947+
listStr += QStringLiteral( " " );
948+
listStr += QStringLiteral( "]" );
949+
return listStr;
945950
}
946951
else
947952
{

0 commit comments

Comments
 (0)