OMEdit propose invalid identifier for Constant block

[sergniko@…]

I have noticed that OMEdit (OpenModelica v1.14.0-dev-26754-g0218247f06 (64-bit) on Windows 7) is now proposing invalid identifier for Constant block now.
Before there are no such thing. (Checked in v1.13 on Ubuntu).

Way to reproduce:

1. Create new class
2. Drag a constant block an accept proposed name - const
3. Drag another constant block - OMEdit proposing constant instead of const2 as it was before.

Same result if you create any block and name it const. Afterward a new Constant block - constant is proposed again.

[Adrian Pop]

This is a recent change:
​https://github.com/OpenModelica/OpenModelica/commit/66641cb7051c20446b710f2cb5ac2219de7a9753
@adeas31: we need to filter out keywords.

[Francesco Casella]

Of course we need to filter out keywords, but we also need to consider the annotation defaultComponentName.

In this case defaultComponentName="const", so when dragging one should obtain const, then const2, const3, etc.

[Adeel Asghar]

Replying to casella:

Of course we need to filter out keywords, but we also need to consider the annotation defaultComponentName.

In this case defaultComponentName="const", so when dragging one should obtain const, then const2, const3, etc.

This is exactly what I changed. I thought if we already have a component with default name then we should use the model name for the next component instead of the defaultComponentName annotation.

[Adeel Asghar]

Fixed in 820af85/OpenModelica.

I have updated according to Francesco's suggestion i.e., use default component name is its present for new name suggestions otherwise use the component name.

It now also checks for Modelica keywords.