Skip to content

Commit ce6a2f6

Browse files
committed
Fix non-clickable force analysis with rust render layer on
Fixes #7139
1 parent 3ad2555 commit ce6a2f6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

rust/src/disassembly.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,10 @@ pub enum InstructionTextTokenKind {
430430
ty: StringType,
431431
},
432432
CharacterConstant,
433-
Keyword,
433+
Keyword {
434+
// Example usage can be found for `BNAnalysisWarningActionType`.
435+
value: u64,
436+
},
434437
TypeName,
435438
FieldName {
436439
/// Offset to this field in the respective structure
@@ -619,7 +622,7 @@ impl InstructionTextTokenKind {
619622
_ => Self::String { value: value.value },
620623
},
621624
BNInstructionTextTokenType::CharacterConstantToken => Self::CharacterConstant,
622-
BNInstructionTextTokenType::KeywordToken => Self::Keyword,
625+
BNInstructionTextTokenType::KeywordToken => Self::Keyword { value: value.value },
623626
BNInstructionTextTokenType::TypeNameToken => Self::TypeName,
624627
BNInstructionTextTokenType::FieldNameToken => Self::FieldName {
625628
offset: value.value,
@@ -735,6 +738,7 @@ impl InstructionTextTokenKind {
735738
InstructionTextTokenKind::HexDumpText { width, .. } => Some(*width),
736739
InstructionTextTokenKind::String { value, .. } => Some(*value),
737740
InstructionTextTokenKind::StringContent { ty, .. } => Some(*ty as u64),
741+
InstructionTextTokenKind::Keyword { value, .. } => Some(*value),
738742
InstructionTextTokenKind::FieldName { offset, .. } => Some(*offset),
739743
InstructionTextTokenKind::StructOffset { offset, .. } => Some(*offset),
740744
InstructionTextTokenKind::StructureHexDumpText { width, .. } => Some(*width),
@@ -843,7 +847,7 @@ impl From<InstructionTextTokenKind> for BNInstructionTextTokenType {
843847
InstructionTextTokenKind::CharacterConstant => {
844848
BNInstructionTextTokenType::CharacterConstantToken
845849
}
846-
InstructionTextTokenKind::Keyword => BNInstructionTextTokenType::KeywordToken,
850+
InstructionTextTokenKind::Keyword { .. } => BNInstructionTextTokenType::KeywordToken,
847851
InstructionTextTokenKind::TypeName => BNInstructionTextTokenType::TypeNameToken,
848852
InstructionTextTokenKind::FieldName { .. } => {
849853
BNInstructionTextTokenType::FieldNameToken

0 commit comments

Comments
 (0)